Support enums

Author: forest-benchling

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

@@ -2,11 +2,13 @@
 
 from .a_model import AModel
 from .all_of_sub_model import AllOfSubModel
+from .all_of_sub_model_type_enum import AllOfSubModelTypeEnum
 from .an_all_of_enum import AnAllOfEnum
 from .an_enum import AnEnum
 from .an_int_enum import AnIntEnum
 from .another_all_of_sub_model import AnotherAllOfSubModel
 from .another_all_of_sub_model_type import AnotherAllOfSubModelType
+from .another_all_of_sub_model_type_enum import AnotherAllOfSubModelTypeEnum
 from .body_upload_file_tests_upload_post import BodyUploadFileTestsUploadPost
 from .different_enum import DifferentEnum
 from .free_form_model import FreeFormModel

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

@@ -2,6 +2,7 @@
 
 import attr
 
+from ..models.all_of_sub_model_type_enum import AllOfSubModelTypeEnum
 from ..types import UNSET, Unset
 
 T = TypeVar("T", bound="AllOfSubModel")
@@ -13,11 +14,15 @@ class AllOfSubModel:
 
     a_sub_property: Union[Unset, str] = UNSET
     type: Union[Unset, str] = UNSET
+    type_enum: Union[Unset, AllOfSubModelTypeEnum] = 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
         type = self.type
+        type_enum: Union[Unset, int] = UNSET
+        if not isinstance(self.type_enum, Unset):
+            type_enum = self.type_enum.value
 
         field_dict: Dict[str, Any] = {}
         field_dict.update(self.additional_properties)
@@ -26,6 +31,8 @@ def to_dict(self) -> Dict[str, Any]:
             field_dict["a_sub_property"] = a_sub_property
         if type is not UNSET:
             field_dict["type"] = type
+        if type_enum is not UNSET:
+            field_dict["type_enum"] = type_enum
 
         return field_dict
 
@@ -36,9 +43,15 @@ def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
 
         type = d.pop("type", UNSET)
 
+        type_enum: Union[Unset, AllOfSubModelTypeEnum] = UNSET
+        _type_enum = d.pop("type_enum", UNSET)
+        if not isinstance(_type_enum, Unset):
+            type_enum = AllOfSubModelTypeEnum(_type_enum)
+
         all_of_sub_model = cls(
             a_sub_property=a_sub_property,
             type=type,
+            type_enum=type_enum,
         )
 
         all_of_sub_model.additional_properties = d

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

@@ -0,0 +1,9 @@
+from enum import IntEnum
+
+
+class AllOfSubModelTypeEnum(IntEnum):
+    VALUE_0 = 0
+    VALUE_1 = 1
+
+    def __str__(self) -> str:
+        return str(self.value)

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

@@ -3,6 +3,7 @@
 import attr
 
 from ..models.another_all_of_sub_model_type import AnotherAllOfSubModelType
+from ..models.another_all_of_sub_model_type_enum import AnotherAllOfSubModelTypeEnum
 from ..types import UNSET, Unset
 
 T = TypeVar("T", bound="AnotherAllOfSubModel")
@@ -14,6 +15,7 @@ class AnotherAllOfSubModel:
 
     another_sub_property: Union[Unset, str] = UNSET
     type: Union[Unset, AnotherAllOfSubModelType] = UNSET
+    type_enum: Union[Unset, AnotherAllOfSubModelTypeEnum] = UNSET
     additional_properties: Dict[str, Any] = attr.ib(init=False, factory=dict)
 
     def to_dict(self) -> Dict[str, Any]:
@@ -22,13 +24,19 @@ def to_dict(self) -> Dict[str, Any]:
         if not isinstance(self.type, Unset):
             type = self.type.value
 
+        type_enum: Union[Unset, int] = UNSET
+        if not isinstance(self.type_enum, Unset):
+            type_enum = self.type_enum.value
+
         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 type is not UNSET:
             field_dict["type"] = type
+        if type_enum is not UNSET:
+            field_dict["type_enum"] = type_enum
 
         return field_dict
 
@@ -42,9 +50,15 @@ def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
         if not isinstance(_type, Unset):
             type = AnotherAllOfSubModelType(_type)
 
+        type_enum: Union[Unset, AnotherAllOfSubModelTypeEnum] = UNSET
+        _type_enum = d.pop("type_enum", UNSET)
+        if not isinstance(_type_enum, Unset):
+            type_enum = AnotherAllOfSubModelTypeEnum(_type_enum)
+
         another_all_of_sub_model = cls(
             another_sub_property=another_sub_property,
             type=type,
+            type_enum=type_enum,
         )
 
         another_all_of_sub_model.additional_properties = d

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

@@ -0,0 +1,8 @@
+from enum import IntEnum
+
+
+class AnotherAllOfSubModelTypeEnum(IntEnum):
+    VALUE_0 = 0
+
+    def __str__(self) -> str:
+        return str(self.value)

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

@@ -3,6 +3,7 @@
 import attr
 
 from ..models.another_all_of_sub_model_type import AnotherAllOfSubModelType
+from ..models.another_all_of_sub_model_type_enum import AnotherAllOfSubModelTypeEnum
 from ..types import UNSET, Unset
 
 T = TypeVar("T", bound="ModelFromAllOf")
@@ -14,6 +15,7 @@ class ModelFromAllOf:
 
     a_sub_property: Union[Unset, str] = UNSET
     type: Union[Unset, AnotherAllOfSubModelType] = UNSET
+    type_enum: Union[Unset, AnotherAllOfSubModelTypeEnum] = UNSET
     another_sub_property: Union[Unset, str] = UNSET
     additional_properties: Dict[str, Any] = attr.ib(init=False, factory=dict)
 
@@ -23,6 +25,10 @@ def to_dict(self) -> Dict[str, Any]:
         if not isinstance(self.type, Unset):
             type = self.type.value
 
+        type_enum: Union[Unset, int] = UNSET
+        if not isinstance(self.type_enum, Unset):
+            type_enum = self.type_enum.value
+
         another_sub_property = self.another_sub_property
 
         field_dict: Dict[str, Any] = {}
@@ -32,6 +38,8 @@ def to_dict(self) -> Dict[str, Any]:
             field_dict["a_sub_property"] = a_sub_property
         if type is not UNSET:
             field_dict["type"] = type
+        if type_enum is not UNSET:
+            field_dict["type_enum"] = type_enum
         if another_sub_property is not UNSET:
             field_dict["another_sub_property"] = another_sub_property
 
@@ -47,11 +55,17 @@ def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
         if not isinstance(_type, Unset):
             type = AnotherAllOfSubModelType(_type)
 
+        type_enum: Union[Unset, AnotherAllOfSubModelTypeEnum] = UNSET
+        _type_enum = d.pop("type_enum", UNSET)
+        if not isinstance(_type_enum, Unset):
+            type_enum = AnotherAllOfSubModelTypeEnum(_type_enum)
+
         another_sub_property = d.pop("another_sub_property", UNSET)
 
         model_from_all_of = cls(
             a_sub_property=a_sub_property,
             type=type,
+            type_enum=type_enum,
             another_sub_property=another_sub_property,
         )
 

end_to_end_tests/openapi.json

@@ -1176,6 +1176,10 @@
           },
           "type": {
             "type": "string"
+          },
+          "type_enum": {
+            "type": "int",
+            "enum": [0, 1]
           }
         }
       },
@@ -1189,6 +1193,10 @@
           "type": {
             "type": "string",
             "enum": ["submodel"]
+          },
+          "type_enum": {
+            "type": "int",
+            "enum": [0]
           }
         }
       },

openapi_python_client/parser/properties/model_property.py

@@ -48,34 +48,43 @@ def get_imports(self, *, prefix: str) -> Set[str]:
         return imports
 
 
+def _is_string_enum(prop: Property) -> bool:
+    return prop.__class__.__name__ == "EnumProperty" and prop.value_type == str
+
+
+def _is_int_enum(prop: Property) -> bool:
+    return prop.__class__.__name__ == "EnumProperty" and prop.value_type == int
+
+
 def _is_subtype(first: Property, second: Property) -> bool:
-    return (
-        first.__class__.__name__ == "EnumProperty"
-        and first.value_type == str
-        and second.__class__.__name__ == "StringProperty"
-    ) or (
-        first.__class__.__name__ == "EnumProperty"
-        and first.value_type == int
-        and second.__class__.__name__ == "IntProperty"
+    return any(
+        [
+            _is_string_enum(first) and second.__class__.__name__ == "StringProperty",
+            _is_int_enum(first) and second.__class__.__name__ == "IntProperty",
+            _is_string_enum(first)
+            and _is_string_enum(second)
+            and set(first.values.items()) <= set(second.values.items()),
+            _is_int_enum(first) and _is_int_enum(second) and set(first.values.items()) <= set(second.values.items()),
+        ]
     )
 
 
 def _merge_properties(first: Property, second: Property) -> Union[Property, PropertyError]:
     nullable = first.nullable and second.nullable
     required = first.required or second.required
 
-    if first.__class__ == second.__class__:
-        first = attr.evolve(first, nullable=nullable, required=required)
-        second = attr.evolve(second, nullable=nullable, required=required)
-        if first != second:
-            return PropertyError(header="Cannot merge properties", detail="Properties has conflicting values")
-        return first
-    elif _is_subtype(first, second):
+    if _is_subtype(first, second):
         first = attr.evolve(first, nullable=nullable, required=required)
         return first
     elif _is_subtype(second, first):
         second = attr.evolve(second, nullable=nullable, required=required)
         return second
+    elif first.__class__ == second.__class__:
+        first = attr.evolve(first, nullable=nullable, required=required)
+        second = attr.evolve(second, nullable=nullable, required=required)
+        if first != second:
+            return PropertyError(header="Cannot merge properties", detail="Properties has conflicting values")
+        return first
     else:
         return PropertyError(
             header="Cannot merge properties",