Merge main-v.0.7.3

Author: forest-benchling

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

@@ -1,28 +1,71 @@
-from typing import Any, Dict, List, Type, TypeVar
+from typing import Any, Dict, List, Type, TypeVar, Union
 
 import attr
 
+from ..models.an_enum import AnEnum
+from ..models.an_int_enum import AnIntEnum
+from ..types import UNSET, Unset
+
 T = TypeVar("T", bound="AModelModel")
 
 
 @attr.s(auto_attribs=True)
 class AModelModel:
     """  """
 
+    a_property: Union[Unset, AnEnum, AnIntEnum] = UNSET
     additional_properties: Dict[str, Any] = attr.ib(init=False, factory=dict)
 
     def to_dict(self) -> Dict[str, Any]:
+        a_property: Union[Unset, int]
+        if isinstance(self.a_property, Unset):
+            a_property = UNSET
+        elif isinstance(self.a_property, AnEnum):
+            a_property = UNSET
+            if not isinstance(self.a_property, Unset):
+                a_property = self.a_property.value
+
+        else:
+            a_property = UNSET
+            if not isinstance(self.a_property, Unset):
+                a_property = self.a_property.value
 
         field_dict: Dict[str, Any] = {}
         field_dict.update(self.additional_properties)
         field_dict.update({})
+        if a_property is not UNSET:
+            field_dict["a_property"] = a_property
 
         return field_dict
 
     @classmethod
     def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
         d = src_dict.copy()
-        a_model_model = cls()
+
+        def _parse_a_property(data: Any) -> Union[Unset, AnEnum, AnIntEnum]:
+            data = None if isinstance(data, Unset) else data
+            a_property: Union[Unset, AnEnum, AnIntEnum]
+            try:
+                a_property = UNSET
+                _a_property = data
+                if _a_property is not None:
+                    a_property = AnEnum(_a_property)
+
+                return a_property
+            except:  # noqa: E722
+                pass
+            a_property = UNSET
+            _a_property = data
+            if _a_property is not None:
+                a_property = AnIntEnum(_a_property)
+
+            return a_property
+
+        a_property = _parse_a_property(d.pop("a_property", UNSET))
+
+        a_model_model = cls(
+            a_property=a_property,
+        )
 
         a_model_model.additional_properties = d
         return a_model_model

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

@@ -1,28 +1,71 @@
-from typing import Any, Dict, List, Type, TypeVar
+from typing import Any, Dict, List, Type, TypeVar, Union
 
 import attr
 
+from ..models.an_enum import AnEnum
+from ..models.an_int_enum import AnIntEnum
+from ..types import UNSET, Unset
+
 T = TypeVar("T", bound="AModelNotRequiredModel")
 
 
 @attr.s(auto_attribs=True)
 class AModelNotRequiredModel:
     """  """
 
+    a_property: Union[Unset, AnEnum, AnIntEnum] = UNSET
     additional_properties: Dict[str, Any] = attr.ib(init=False, factory=dict)
 
     def to_dict(self) -> Dict[str, Any]:
+        a_property: Union[Unset, int]
+        if isinstance(self.a_property, Unset):
+            a_property = UNSET
+        elif isinstance(self.a_property, AnEnum):
+            a_property = UNSET
+            if not isinstance(self.a_property, Unset):
+                a_property = self.a_property.value
+
+        else:
+            a_property = UNSET
+            if not isinstance(self.a_property, Unset):
+                a_property = self.a_property.value
 
         field_dict: Dict[str, Any] = {}
         field_dict.update(self.additional_properties)
         field_dict.update({})
+        if a_property is not UNSET:
+            field_dict["a_property"] = a_property
 
         return field_dict
 
     @classmethod
     def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
         d = src_dict.copy()
-        a_model_not_required_model = cls()
+
+        def _parse_a_property(data: Any) -> Union[Unset, AnEnum, AnIntEnum]:
+            data = None if isinstance(data, Unset) else data
+            a_property: Union[Unset, AnEnum, AnIntEnum]
+            try:
+                a_property = UNSET
+                _a_property = data
+                if _a_property is not None:
+                    a_property = AnEnum(_a_property)
+
+                return a_property
+            except:  # noqa: E722
+                pass
+            a_property = UNSET
+            _a_property = data
+            if _a_property is not None:
+                a_property = AnIntEnum(_a_property)
+
+            return a_property
+
+        a_property = _parse_a_property(d.pop("a_property", UNSET))
+
+        a_model_not_required_model = cls(
+            a_property=a_property,
+        )
 
         a_model_not_required_model.additional_properties = d
         return a_model_not_required_model

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

@@ -1,28 +1,71 @@
-from typing import Any, Dict, List, Type, TypeVar
+from typing import Any, Dict, List, Type, TypeVar, Union
 
 import attr
 
+from ..models.an_enum import AnEnum
+from ..models.an_int_enum import AnIntEnum
+from ..types import UNSET, Unset
+
 T = TypeVar("T", bound="AModelNotRequiredNullableModel")
 
 
 @attr.s(auto_attribs=True)
 class AModelNotRequiredNullableModel:
     """  """
 
+    a_property: Union[Unset, AnEnum, AnIntEnum] = UNSET
     additional_properties: Dict[str, Any] = attr.ib(init=False, factory=dict)
 
     def to_dict(self) -> Dict[str, Any]:
+        a_property: Union[Unset, int]
+        if isinstance(self.a_property, Unset):
+            a_property = UNSET
+        elif isinstance(self.a_property, AnEnum):
+            a_property = UNSET
+            if not isinstance(self.a_property, Unset):
+                a_property = self.a_property.value
+
+        else:
+            a_property = UNSET
+            if not isinstance(self.a_property, Unset):
+                a_property = self.a_property.value
 
         field_dict: Dict[str, Any] = {}
         field_dict.update(self.additional_properties)
         field_dict.update({})
+        if a_property is not UNSET:
+            field_dict["a_property"] = a_property
 
         return field_dict
 
     @classmethod
     def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
         d = src_dict.copy()
-        a_model_not_required_nullable_model = cls()
+
+        def _parse_a_property(data: Any) -> Union[Unset, AnEnum, AnIntEnum]:
+            data = None if isinstance(data, Unset) else data
+            a_property: Union[Unset, AnEnum, AnIntEnum]
+            try:
+                a_property = UNSET
+                _a_property = data
+                if _a_property is not None:
+                    a_property = AnEnum(_a_property)
+
+                return a_property
+            except:  # noqa: E722
+                pass
+            a_property = UNSET
+            _a_property = data
+            if _a_property is not None:
+                a_property = AnIntEnum(_a_property)
+
+            return a_property
+
+        a_property = _parse_a_property(d.pop("a_property", UNSET))
+
+        a_model_not_required_nullable_model = cls(
+            a_property=a_property,
+        )
 
         a_model_not_required_nullable_model.additional_properties = d
         return a_model_not_required_nullable_model

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

@@ -1,28 +1,71 @@
-from typing import Any, Dict, List, Type, TypeVar
+from typing import Any, Dict, List, Type, TypeVar, Union
 
 import attr
 
+from ..models.an_enum import AnEnum
+from ..models.an_int_enum import AnIntEnum
+from ..types import UNSET, Unset
+
 T = TypeVar("T", bound="AModelNullableModel")
 
 
 @attr.s(auto_attribs=True)
 class AModelNullableModel:
     """  """
 
+    a_property: Union[Unset, AnEnum, AnIntEnum] = UNSET
     additional_properties: Dict[str, Any] = attr.ib(init=False, factory=dict)
 
     def to_dict(self) -> Dict[str, Any]:
+        a_property: Union[Unset, int]
+        if isinstance(self.a_property, Unset):
+            a_property = UNSET
+        elif isinstance(self.a_property, AnEnum):
+            a_property = UNSET
+            if not isinstance(self.a_property, Unset):
+                a_property = self.a_property.value
+
+        else:
+            a_property = UNSET
+            if not isinstance(self.a_property, Unset):
+                a_property = self.a_property.value
 
         field_dict: Dict[str, Any] = {}
         field_dict.update(self.additional_properties)
         field_dict.update({})
+        if a_property is not UNSET:
+            field_dict["a_property"] = a_property
 
         return field_dict
 
     @classmethod
     def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
         d = src_dict.copy()
-        a_model_nullable_model = cls()
+
+        def _parse_a_property(data: Any) -> Union[Unset, AnEnum, AnIntEnum]:
+            data = None if isinstance(data, Unset) else data
+            a_property: Union[Unset, AnEnum, AnIntEnum]
+            try:
+                a_property = UNSET
+                _a_property = data
+                if _a_property is not None:
+                    a_property = AnEnum(_a_property)
+
+                return a_property
+            except:  # noqa: E722
+                pass
+            a_property = UNSET
+            _a_property = data
+            if _a_property is not None:
+                a_property = AnIntEnum(_a_property)
+
+            return a_property
+
+        a_property = _parse_a_property(d.pop("a_property", UNSET))
+
+        a_model_nullable_model = cls(
+            a_property=a_property,
+        )
 
         a_model_nullable_model.additional_properties = d
         return a_model_nullable_model

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

@@ -1,28 +1,71 @@
-from typing import Any, Dict, List, Type, TypeVar
+from typing import Any, Dict, List, Type, TypeVar, Union
 
 import attr
 
+from ..models.an_enum import AnEnum
+from ..models.an_int_enum import AnIntEnum
+from ..types import UNSET, Unset
+
 T = TypeVar("T", bound="AModelModel")
 
 
 @attr.s(auto_attribs=True)
 class AModelModel:
     """  """
 
+    a_property: Union[Unset, AnEnum, AnIntEnum] = UNSET
     additional_properties: Dict[str, Any] = attr.ib(init=False, factory=dict)
 
     def to_dict(self) -> Dict[str, Any]:
+        a_property: Union[Unset, int]
+        if isinstance(self.a_property, Unset):
+            a_property = UNSET
+        elif isinstance(self.a_property, AnEnum):
+            a_property = UNSET
+            if not isinstance(self.a_property, Unset):
+                a_property = self.a_property.value
+
+        else:
+            a_property = UNSET
+            if not isinstance(self.a_property, Unset):
+                a_property = self.a_property.value
 
         field_dict: Dict[str, Any] = {}
         field_dict.update(self.additional_properties)
         field_dict.update({})
+        if a_property is not UNSET:
+            field_dict["a_property"] = a_property
 
         return field_dict
 
     @classmethod
     def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
         d = src_dict.copy()
-        a_model_model = cls()
+
+        def _parse_a_property(data: Any) -> Union[Unset, AnEnum, AnIntEnum]:
+            data = None if isinstance(data, Unset) else data
+            a_property: Union[Unset, AnEnum, AnIntEnum]
+            try:
+                a_property = UNSET
+                _a_property = data
+                if _a_property is not None:
+                    a_property = AnEnum(_a_property)
+
+                return a_property
+            except:  # noqa: E722
+                pass
+            a_property = UNSET
+            _a_property = data
+            if _a_property is not None:
+                a_property = AnIntEnum(_a_property)
+
+            return a_property
+
+        a_property = _parse_a_property(d.pop("a_property", UNSET))
+
+        a_model_model = cls(
+            a_property=a_property,
+        )
 
         a_model_model.additional_properties = d
         return a_model_model