Add allOf support for model definitions (#98)

Collapses the child elements into one, without class heirarchy, mixins, etc.

Author: packyg

CHANGELOG.md

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - `none` will not create a project folder at all, only the inner package folder (which won't be inner anymore)
 - Attempt to detect and alert users if they are using an unsupported version of OpenAPI (#281).
 - Fixes `Enum` deserialization when the value is `UNSET`.
+- Basic support for `allOf` in models (#98)
 
 ### Changes
 

end_to_end_tests/golden-record-custom/custom_e2e/models/__init__.py

@@ -1,12 +1,15 @@
 """ Contains all the data models used in inputs/outputs """
 
 from .a_model import AModel
+from .all_of_sub_model import AllOfSubModel
 from .an_enum import AnEnum
 from .an_int_enum import AnIntEnum
+from .another_all_of_sub_model import AnotherAllOfSubModel
 from .body_upload_file_tests_upload_post import BodyUploadFileTestsUploadPost
 from .different_enum import DifferentEnum
 from .free_form_model import FreeFormModel
 from .http_validation_error import HTTPValidationError
+from .model_from_all_of import ModelFromAllOf
 from .model_with_additional_properties_inlined import ModelWithAdditionalPropertiesInlined
 from .model_with_additional_properties_inlined_additional_property import (
     ModelWithAdditionalPropertiesInlinedAdditionalProperty,

end_to_end_tests/golden-record-custom/custom_e2e/models/all_of_sub_model.py

@@ -0,0 +1,54 @@
+from typing import Any, Dict, List, Type, TypeVar, Union
+
+import attr
+
+from ..types import UNSET, Unset
+
+T = TypeVar("T", bound="AllOfSubModel")
+
+
+@attr.s(auto_attribs=True)
+class AllOfSubModel:
+    """  """
+
+    a_sub_property: Union[Unset, str] = UNSET
+    additional_properties: Dict[str, Any] = attr.ib(init=False, factory=dict)
+
+    def to_dict(self) -> Dict[str, Any]:
+        a_sub_property = self.a_sub_property
+
+        field_dict: Dict[str, Any] = {}
+        field_dict.update(self.additional_properties)
+        field_dict.update({})
+        if a_sub_property is not UNSET:
+            field_dict["a_sub_property"] = a_sub_property
+
+        return field_dict
+
+    @classmethod
+    def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
+        d = src_dict.copy()
+        a_sub_property = d.pop("a_sub_property", UNSET)
+
+        all_of_sub_model = cls(
+            a_sub_property=a_sub_property,
+        )
+
+        all_of_sub_model.additional_properties = d
+        return all_of_sub_model
+
+    @property
+    def additional_keys(self) -> List[str]:
+        return list(self.additional_properties.keys())
+
+    def __getitem__(self, key: str) -> Any:
+        return self.additional_properties[key]
+
+    def __setitem__(self, key: str, value: Any) -> None:
+        self.additional_properties[key] = value
+
+    def __delitem__(self, key: str) -> None:
+        del self.additional_properties[key]
+
+    def __contains__(self, key: str) -> bool:
+        return key in self.additional_properties

end_to_end_tests/golden-record-custom/custom_e2e/models/another_all_of_sub_model.py

@@ -0,0 +1,54 @@
+from typing import Any, Dict, List, Type, TypeVar, Union
+
+import attr
+
+from ..types import UNSET, Unset
+
+T = TypeVar("T", bound="AnotherAllOfSubModel")
+
+
+@attr.s(auto_attribs=True)
+class AnotherAllOfSubModel:
+    """  """
+
+    another_sub_property: Union[Unset, str] = UNSET
+    additional_properties: Dict[str, Any] = attr.ib(init=False, factory=dict)
+
+    def to_dict(self) -> Dict[str, Any]:
+        another_sub_property = self.another_sub_property
+
+        field_dict: Dict[str, Any] = {}
+        field_dict.update(self.additional_properties)
+        field_dict.update({})
+        if another_sub_property is not UNSET:
+            field_dict["another_sub_property"] = another_sub_property
+
+        return field_dict
+
+    @classmethod
+    def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
+        d = src_dict.copy()
+        another_sub_property = d.pop("another_sub_property", UNSET)
+
+        another_all_of_sub_model = cls(
+            another_sub_property=another_sub_property,
+        )
+
+        another_all_of_sub_model.additional_properties = d
+        return another_all_of_sub_model
+
+    @property
+    def additional_keys(self) -> List[str]:
+        return list(self.additional_properties.keys())
+
+    def __getitem__(self, key: str) -> Any:
+        return self.additional_properties[key]
+
+    def __setitem__(self, key: str, value: Any) -> None:
+        self.additional_properties[key] = value
+
+    def __delitem__(self, key: str) -> None:
+        del self.additional_properties[key]
+
+    def __contains__(self, key: str) -> bool:
+        return key in self.additional_properties

end_to_end_tests/golden-record-custom/custom_e2e/models/model_from_all_of.py

@@ -0,0 +1,61 @@
+from typing import Any, Dict, List, Type, TypeVar, Union
+
+import attr
+
+from ..types import UNSET, Unset
+
+T = TypeVar("T", bound="ModelFromAllOf")
+
+
+@attr.s(auto_attribs=True)
+class ModelFromAllOf:
+    """  """
+
+    another_sub_property: Union[Unset, str] = UNSET
+    a_sub_property: Union[Unset, str] = UNSET
+    additional_properties: Dict[str, Any] = attr.ib(init=False, factory=dict)
+
+    def to_dict(self) -> Dict[str, Any]:
+        another_sub_property = self.another_sub_property
+        a_sub_property = self.a_sub_property
+
+        field_dict: Dict[str, Any] = {}
+        field_dict.update(self.additional_properties)
+        field_dict.update({})
+        if another_sub_property is not UNSET:
+            field_dict["another_sub_property"] = another_sub_property
+        if a_sub_property is not UNSET:
+            field_dict["a_sub_property"] = a_sub_property
+
+        return field_dict
+
+    @classmethod
+    def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
+        d = src_dict.copy()
+        another_sub_property = d.pop("another_sub_property", UNSET)
+
+        a_sub_property = d.pop("a_sub_property", UNSET)
+
+        model_from_all_of = cls(
+            another_sub_property=another_sub_property,
+            a_sub_property=a_sub_property,
+        )
+
+        model_from_all_of.additional_properties = d
+        return model_from_all_of
+
+    @property
+    def additional_keys(self) -> List[str]:
+        return list(self.additional_properties.keys())
+
+    def __getitem__(self, key: str) -> Any:
+        return self.additional_properties[key]
+
+    def __setitem__(self, key: str, value: Any) -> None:
+        self.additional_properties[key] = value
+
+    def __delitem__(self, key: str) -> None:
+        del self.additional_properties[key]
+
+    def __contains__(self, key: str) -> bool:
+        return key in self.additional_properties

end_to_end_tests/golden-record/my_test_api_client/models/__init__.py

@@ -1,12 +1,15 @@
 """ Contains all the data models used in inputs/outputs """
 
 from .a_model import AModel
+from .all_of_sub_model import AllOfSubModel
 from .an_enum import AnEnum
 from .an_int_enum import AnIntEnum
+from .another_all_of_sub_model import AnotherAllOfSubModel
 from .body_upload_file_tests_upload_post import BodyUploadFileTestsUploadPost
 from .different_enum import DifferentEnum
 from .free_form_model import FreeFormModel
 from .http_validation_error import HTTPValidationError
+from .model_from_all_of import ModelFromAllOf
 from .model_with_additional_properties_inlined import ModelWithAdditionalPropertiesInlined
 from .model_with_additional_properties_inlined_additional_property import (
     ModelWithAdditionalPropertiesInlinedAdditionalProperty,

end_to_end_tests/golden-record/my_test_api_client/models/all_of_sub_model.py

@@ -0,0 +1,54 @@
+from typing import Any, Dict, List, Type, TypeVar, Union
+
+import attr
+
+from ..types import UNSET, Unset
+
+T = TypeVar("T", bound="AllOfSubModel")
+
+
+@attr.s(auto_attribs=True)
+class AllOfSubModel:
+    """  """
+
+    a_sub_property: Union[Unset, str] = UNSET
+    additional_properties: Dict[str, Any] = attr.ib(init=False, factory=dict)
+
+    def to_dict(self) -> Dict[str, Any]:
+        a_sub_property = self.a_sub_property
+
+        field_dict: Dict[str, Any] = {}
+        field_dict.update(self.additional_properties)
+        field_dict.update({})
+        if a_sub_property is not UNSET:
+            field_dict["a_sub_property"] = a_sub_property
+
+        return field_dict
+
+    @classmethod
+    def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
+        d = src_dict.copy()
+        a_sub_property = d.pop("a_sub_property", UNSET)
+
+        all_of_sub_model = cls(
+            a_sub_property=a_sub_property,
+        )
+
+        all_of_sub_model.additional_properties = d
+        return all_of_sub_model
+
+    @property
+    def additional_keys(self) -> List[str]:
+        return list(self.additional_properties.keys())
+
+    def __getitem__(self, key: str) -> Any:
+        return self.additional_properties[key]
+
+    def __setitem__(self, key: str, value: Any) -> None:
+        self.additional_properties[key] = value
+
+    def __delitem__(self, key: str) -> None:
+        del self.additional_properties[key]
+
+    def __contains__(self, key: str) -> bool:
+        return key in self.additional_properties

end_to_end_tests/golden-record/my_test_api_client/models/another_all_of_sub_model.py

@@ -0,0 +1,54 @@
+from typing import Any, Dict, List, Type, TypeVar, Union
+
+import attr
+
+from ..types import UNSET, Unset
+
+T = TypeVar("T", bound="AnotherAllOfSubModel")
+
+
+@attr.s(auto_attribs=True)
+class AnotherAllOfSubModel:
+    """  """
+
+    another_sub_property: Union[Unset, str] = UNSET
+    additional_properties: Dict[str, Any] = attr.ib(init=False, factory=dict)
+
+    def to_dict(self) -> Dict[str, Any]:
+        another_sub_property = self.another_sub_property
+
+        field_dict: Dict[str, Any] = {}
+        field_dict.update(self.additional_properties)
+        field_dict.update({})
+        if another_sub_property is not UNSET:
+            field_dict["another_sub_property"] = another_sub_property
+
+        return field_dict
+
+    @classmethod
+    def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
+        d = src_dict.copy()
+        another_sub_property = d.pop("another_sub_property", UNSET)
+
+        another_all_of_sub_model = cls(
+            another_sub_property=another_sub_property,
+        )
+
+        another_all_of_sub_model.additional_properties = d
+        return another_all_of_sub_model
+
+    @property
+    def additional_keys(self) -> List[str]:
+        return list(self.additional_properties.keys())
+
+    def __getitem__(self, key: str) -> Any:
+        return self.additional_properties[key]
+
+    def __setitem__(self, key: str, value: Any) -> None:
+        self.additional_properties[key] = value
+
+    def __delitem__(self, key: str) -> None:
+        del self.additional_properties[key]
+
+    def __contains__(self, key: str) -> bool:
+        return key in self.additional_properties

end_to_end_tests/golden-record/my_test_api_client/models/model_from_all_of.py

@@ -0,0 +1,61 @@
+from typing import Any, Dict, List, Type, TypeVar, Union
+
+import attr
+
+from ..types import UNSET, Unset
+
+T = TypeVar("T", bound="ModelFromAllOf")
+
+
+@attr.s(auto_attribs=True)
+class ModelFromAllOf:
+    """  """
+
+    another_sub_property: Union[Unset, str] = UNSET
+    a_sub_property: Union[Unset, str] = UNSET
+    additional_properties: Dict[str, Any] = attr.ib(init=False, factory=dict)
+
+    def to_dict(self) -> Dict[str, Any]:
+        another_sub_property = self.another_sub_property
+        a_sub_property = self.a_sub_property
+
+        field_dict: Dict[str, Any] = {}
+        field_dict.update(self.additional_properties)
+        field_dict.update({})
+        if another_sub_property is not UNSET:
+            field_dict["another_sub_property"] = another_sub_property
+        if a_sub_property is not UNSET:
+            field_dict["a_sub_property"] = a_sub_property
+
+        return field_dict
+
+    @classmethod
+    def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
+        d = src_dict.copy()
+        another_sub_property = d.pop("another_sub_property", UNSET)
+
+        a_sub_property = d.pop("a_sub_property", UNSET)
+
+        model_from_all_of = cls(
+            another_sub_property=another_sub_property,
+            a_sub_property=a_sub_property,
+        )
+
+        model_from_all_of.additional_properties = d
+        return model_from_all_of
+
+    @property
+    def additional_keys(self) -> List[str]:
+        return list(self.additional_properties.keys())
+
+    def __getitem__(self, key: str) -> Any:
+        return self.additional_properties[key]
+
+    def __setitem__(self, key: str, value: Any) -> None:
+        self.additional_properties[key] = value
+
+    def __delitem__(self, key: str) -> None:
+        del self.additional_properties[key]
+
+    def __contains__(self, key: str) -> bool:
+        return key in self.additional_properties