Refactor out logic for JSON types and fix enum value bug

Author: forest-benchling

end_to_end_tests/golden-record-custom/custom_e2e/api/tests/defaults_tests_defaults_post.py

@@ -96,22 +96,22 @@ def httpx_request(
     else:
         json_union_prop = union_prop
 
-    json_union_prop_with_ref: Union[Unset, None, float, AnEnum]
+    json_union_prop_with_ref: Union[Unset, None, float, int]
     if isinstance(union_prop_with_ref, Unset):
         json_union_prop_with_ref = UNSET
     elif union_prop_with_ref is None:
         json_union_prop_with_ref = None
     elif isinstance(union_prop_with_ref, AnEnum):
         json_union_prop_with_ref = UNSET
         if not isinstance(union_prop_with_ref, Unset):
-            json_union_prop_with_ref = union_prop_with_ref
+            json_union_prop_with_ref = union_prop_with_ref.value
 
     else:
         json_union_prop_with_ref = union_prop_with_ref
 
-    json_enum_prop: Union[Unset, None, AnEnum] = UNSET
+    json_enum_prop: Union[Unset, None, int] = UNSET
     if not isinstance(enum_prop, Unset):
-        json_enum_prop = enum_prop if enum_prop else None
+        json_enum_prop = enum_prop.value if enum_prop else None
 
     params: Dict[str, Any] = {
         "required_not_nullable_datetime_prop": json_required_not_nullable_datetime_prop,

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

@@ -16,18 +16,18 @@ class ModelWithUnionProperty:
     a_property: Union[Unset, AnEnum, AnIntEnum] = UNSET
 
     def to_dict(self) -> Dict[str, Any]:
-        a_property: Union[Unset, AnEnum, AnIntEnum]
+        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
+                a_property = self.a_property.value
 
         else:
             a_property = UNSET
             if not isinstance(self.a_property, Unset):
-                a_property = self.a_property
+                a_property = self.a_property.value
 
         field_dict: Dict[str, Any] = {}
         field_dict.update({})

end_to_end_tests/golden-record-custom/custom_e2e/types.py

@@ -11,6 +11,9 @@ def __bool__(self) -> bool:
 
 UNSET: Unset = Unset()
 
+# Used as `FileProperty._json_type_string`
+FileJsonType = Tuple[Optional[str], Union[BinaryIO, TextIO], Optional[str]]
+
 
 @attr.s(auto_attribs=True)
 class File:
@@ -20,7 +23,7 @@ class File:
     file_name: Optional[str] = None
     mime_type: Optional[str] = None
 
-    def to_tuple(self) -> Tuple[Optional[str], Union[BinaryIO, TextIO], Optional[str]]:
+    def to_tuple(self) -> FileJsonType:
         """ Return a tuple representation that httpx will accept for multipart/form-data """
         return self.file_name, self.payload, self.mime_type
 

end_to_end_tests/golden-record/my_test_api_client/api/tests/defaults_tests_defaults_post.py

@@ -72,22 +72,22 @@ def _get_kwargs(
     else:
         json_union_prop = union_prop
 
-    json_union_prop_with_ref: Union[Unset, None, float, AnEnum]
+    json_union_prop_with_ref: Union[Unset, None, float, int]
     if isinstance(union_prop_with_ref, Unset):
         json_union_prop_with_ref = UNSET
     elif union_prop_with_ref is None:
         json_union_prop_with_ref = None
     elif isinstance(union_prop_with_ref, AnEnum):
         json_union_prop_with_ref = UNSET
         if not isinstance(union_prop_with_ref, Unset):
-            json_union_prop_with_ref = union_prop_with_ref
+            json_union_prop_with_ref = union_prop_with_ref.value
 
     else:
         json_union_prop_with_ref = union_prop_with_ref
 
-    json_enum_prop: Union[Unset, None, AnEnum] = UNSET
+    json_enum_prop: Union[Unset, None, int] = UNSET
     if not isinstance(enum_prop, Unset):
-        json_enum_prop = enum_prop if enum_prop else None
+        json_enum_prop = enum_prop.value if enum_prop else None
 
     params: Dict[str, Any] = {
         "required_not_nullable_datetime_prop": json_required_not_nullable_datetime_prop,

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

@@ -16,18 +16,18 @@ class ModelWithUnionProperty:
     a_property: Union[Unset, AnEnum, AnIntEnum] = UNSET
 
     def to_dict(self) -> Dict[str, Any]:
-        a_property: Union[Unset, AnEnum, AnIntEnum]
+        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
+                a_property = self.a_property.value
 
         else:
             a_property = UNSET
             if not isinstance(self.a_property, Unset):
-                a_property = self.a_property
+                a_property = self.a_property.value
 
         field_dict: Dict[str, Any] = {}
         field_dict.update({})

end_to_end_tests/golden-record/my_test_api_client/types.py

@@ -11,6 +11,9 @@ def __bool__(self) -> bool:
 
 UNSET: Unset = Unset()
 
+# Used as `FileProperty._json_type_string`
+FileJsonType = Tuple[Optional[str], Union[BinaryIO, TextIO], Optional[str]]
+
 
 @attr.s(auto_attribs=True)
 class File:
@@ -20,7 +23,7 @@ class File:
     file_name: Optional[str] = None
     mime_type: Optional[str] = None
 
-    def to_tuple(self) -> Tuple[Optional[str], Union[BinaryIO, TextIO], Optional[str]]:
+    def to_tuple(self) -> FileJsonType:
         """ Return a tuple representation that httpx will accept for multipart/form-data """
         return self.file_name, self.payload, self.mime_type
 

openapi_python_client/parser/properties/__init__.py

@@ -19,6 +19,7 @@ class NoneProperty(Property):
     """ A property that is always None (used for empty schemas) """
 
     _type_string: ClassVar[str] = "None"
+    _json_type_string: ClassVar[str] = "None"
     template: ClassVar[Optional[str]] = "none_property.pyi"
 
 
@@ -29,6 +30,7 @@ class StringProperty(Property):
     max_length: Optional[int] = None
     pattern: Optional[str] = None
     _type_string: ClassVar[str] = "str"
+    _json_type_string: ClassVar[str] = "str"
 
 
 @attr.s(auto_attribs=True, frozen=True)
@@ -38,6 +40,7 @@ class DateTimeProperty(Property):
     """
 
     _type_string: ClassVar[str] = "datetime.datetime"
+    _json_type_string: ClassVar[str] = "str"
     template: ClassVar[str] = "datetime_property.pyi"
 
     def get_imports(self, *, prefix: str) -> Set[str]:
@@ -58,6 +61,7 @@ class DateProperty(Property):
     """ A property of type datetime.date """
 
     _type_string: ClassVar[str] = "datetime.date"
+    _json_type_string: ClassVar[str] = "str"
     template: ClassVar[str] = "date_property.pyi"
 
     def get_imports(self, *, prefix: str) -> Set[str]:
@@ -78,6 +82,8 @@ class FileProperty(Property):
     """ A property used for uploading files """
 
     _type_string: ClassVar[str] = "File"
+    # Return type of File.to_tuple()
+    _json_type_string: ClassVar[str] = "Tuple[Optional[str], Union[BinaryIO, TextIO], Optional[str]]"
     template: ClassVar[str] = "file_property.pyi"
 
     def get_imports(self, *, prefix: str) -> Set[str]:
@@ -98,20 +104,23 @@ class FloatProperty(Property):
     """ A property of type float """
 
     _type_string: ClassVar[str] = "float"
+    _json_type_string: ClassVar[str] = "float"
 
 
 @attr.s(auto_attribs=True, frozen=True)
 class IntProperty(Property):
     """ A property of type int """
 
     _type_string: ClassVar[str] = "int"
+    _json_type_string: ClassVar[str] = "int"
 
 
 @attr.s(auto_attribs=True, frozen=True)
 class BooleanProperty(Property):
     """ Property for bool """
 
     _type_string: ClassVar[str] = "bool"
+    _json_type_string: ClassVar[str] = "bool"
 
 
 InnerProp = TypeVar("InnerProp", bound=Property)
@@ -122,6 +131,7 @@ class ListProperty(Property, Generic[InnerProp]):
     """ A property representing a list (array) of other properties """
 
     inner_property: InnerProp
+    _json_type_string: ClassVar[str] = "List[Any]"
     template: ClassVar[str] = "list_property.pyi"
 
     def get_base_type_string(self) -> str:
@@ -159,37 +169,38 @@ def __attrs_post_init__(self) -> None:
             self, "has_properties_without_templates", any(prop.template is None for prop in self.inner_properties)
         )
 
-    def _get_inner_prop_string(self) -> str:
-        inner_types = [p.get_type_string(no_optional=True) for p in self.inner_properties]
-        return ", ".join(inner_types)
+    def _get_inner_prop_string(self, json: bool = False) -> str:
+        inner_types = [p.get_type_string(no_optional=True, json=json) for p in self.inner_properties]
+        unique_inner_types = list(dict.fromkeys(inner_types))
+        return ", ".join(unique_inner_types)
 
     def get_base_type_string(self) -> str:
         return f"Union[{self._get_inner_prop_string()}]"
 
-    def get_type_string(self, no_optional: bool = False, query_parameter: bool = False) -> str:
+    def get_type_string(self, no_optional: bool = False, query_parameter: bool = False, json: bool = False) -> str:
         """
         Get a string representation of type that should be used when declaring this property.
 
         This implementation differs slightly from `Property.get_type_string` in order to collapse
         nested union types.
         """
-        type_string = self.get_base_type_string()
+        type_string = f"Union[{self._get_inner_prop_string(json=json)}]"
         if no_optional:
             return type_string
         if self.required:
             if self.nullable:
-                return f"Union[None, {self._get_inner_prop_string()}]"
+                return f"Union[None, {self._get_inner_prop_string(json=json)}]"
             else:
                 return type_string
         else:
             if self.nullable:
-                return f"Union[Unset, None, {self._get_inner_prop_string()}]"
+                return f"Union[Unset, None, {self._get_inner_prop_string(json=json)}]"
             else:
                 if query_parameter:
                     # For query parameters, None has the same meaning as Unset
-                    return f"Union[Unset, None, {self._get_inner_prop_string()}]"
+                    return f"Union[Unset, None, {self._get_inner_prop_string(json=json)}]"
                 else:
-                    return f"Union[Unset, {self._get_inner_prop_string()}]"
+                    return f"Union[Unset, {self._get_inner_prop_string(json=json)}]"
 
     def get_imports(self, *, prefix: str) -> Set[str]:
         """

openapi_python_client/parser/properties/enum_property.py

@@ -18,6 +18,7 @@ class EnumProperty(Property):
     values: Dict[str, ValueType]
     reference: Reference
     value_type: Type[ValueType]
+    _json_type_string: ClassVar[str] = "int"
     default: Optional[Any] = attr.ib()
 
     template: ClassVar[str] = "enum_property.pyi"

openapi_python_client/parser/properties/model_property.py

@@ -17,6 +17,7 @@ class ModelProperty(Property):
     description: str
     relative_imports: Set[str]
     additional_properties: Union[bool, Property]
+    _json_type_string: ClassVar[str] = "Dict[str, Any]"
 
     template: ClassVar[str] = "model_property.pyi"
 

openapi_python_client/parser/properties/property.py

@@ -24,6 +24,7 @@ class Property:
     required: bool
     nullable: bool
     _type_string: ClassVar[str] = ""
+    _json_type_string: ClassVar[str] = ""  # Type of the property after JSON serialization
     default: Optional[str] = attr.ib()
     python_name: str = attr.ib(init=False)
 
@@ -35,15 +36,20 @@ def __attrs_post_init__(self) -> None:
     def get_base_type_string(self) -> str:
         return self._type_string
 
-    def get_type_string(self, no_optional: bool = False, query_parameter: bool = False) -> str:
+    def get_type_string(self, no_optional: bool = False, query_parameter: bool = False, json: bool = False) -> str:
         """
         Get a string representation of type that should be used when declaring this property
 
         Args:
             no_optional: Do not include Optional or Unset even if the value is optional (needed for isinstance checks)
             query_parameter: True if the property's type is being used for a query parameter
+            json: True if the type refers to the property after JSON serialization
         """
-        type_string = self.get_base_type_string()
+        if json:
+            type_string = self._json_type_string
+        else:
+            type_string = self.get_base_type_string()
+
         if no_optional:
             return type_string
         if self.required:

openapi_python_client/templates/property_templates/date_property.pyi

@@ -13,7 +13,7 @@ if _{{ property.python_name }} is not None:
 {% if property.required %}
 {{ destination }} = {{ source }}.isoformat() {% if property.nullable %}if {{ source }} else None {%endif%}
 {% else %}
-{{ destination }}{% if declare_type %}: Union[Unset, {% if property.nullable or query_parameter %}None, {% endif %}str]{% endif %} = UNSET
+{{ destination }}{% if declare_type %}: {{ property.get_type_string(query_parameter=query_parameter, json=True) }}{% endif %} = UNSET
 if not isinstance({{ source }}, Unset):
 {% if property.nullable or query_parameter %}
     {{ destination }} = {{ source }}.isoformat() if {{ source }} else None

openapi_python_client/templates/property_templates/datetime_property.pyi

@@ -22,7 +22,7 @@ if _{{ property.python_name }} is not None:
 {{ destination }} = {{ source }}.isoformat()
 {% endif %}
 {% else %}
-{{ destination }}{% if declare_type %}: Union[Unset, {% if property.nullable or query_parameter %}None, {% endif %}str]{% endif %} = UNSET
+{{ destination }}{% if declare_type %}: {{ property.get_type_string(query_parameter=query_parameter, json=True) }}{% endif %} = UNSET
 if not isinstance({{ source }}, Unset):
 {% if property.nullable or query_parameter %}
     {{ destination }} = {{ source }}.isoformat() if {{ source }} else None

openapi_python_client/templates/property_templates/enum_property.pyi

@@ -17,12 +17,12 @@ if _{{ property.python_name }} is not None:
 {{ destination }} = {{ source }}.value
 {% endif %}
 {% else %}
-{{ destination }}{% if declare_type %}: {{ property.get_type_string(query_parameter=query_parameter) }}{% endif %} = UNSET
+{{ destination }}{% if declare_type %}: {{ property.get_type_string(query_parameter=query_parameter, json=True) }}{% endif %} = UNSET
 if not isinstance({{ source }}, Unset):
 {% if property.nullable or query_parameter %}
-    {{ destination }} = {{ source }} if {{ source }} else None
+    {{ destination }} = {{ source }}.value if {{ source }} else None
 {% else %}
-    {{ destination }} = {{ source }}
+    {{ destination }} = {{ source }}.value
 {% endif %}
 {% endif %}
 {% endmacro %}

openapi_python_client/templates/property_templates/file_property.pyi

@@ -12,7 +12,7 @@
 {{ destination }} = {{ source }}.to_tuple()
 {% endif %}
 {% else %}
-{{ destination }}{% if declare_type %}: {{ property.get_type_string(query_parameter=query_parameter) }}{% endif %} = UNSET
+{{ destination }}{% if declare_type %}: {{ property.get_type_string(query_parameter=query_parameter, json=True) }}{% endif %} = UNSET
 if not isinstance({{ source }}, Unset):
 {% if property.nullable or query_parameter %}
     {{ destination }} = {{ source }}.to_tuple() if {{ source }} else None

openapi_python_client/templates/property_templates/list_property.pyi

@@ -44,7 +44,7 @@ else:
 {{ _transform(property, source, destination) }}
 {% endif %}
 {% else %}
-{{ destination }}{% if declare_type %}: Union[Unset, {% if property.nullable or query_parameter %}None, {% endif %}List[Any]]{% endif %} = UNSET
+{{ destination }}{% if declare_type %}: {{ property.get_type_string(query_parameter=query_parameter, json=True) }}{% endif %} = UNSET
 if not isinstance({{ source }}, Unset):
 {% if property.nullable or query_parameter %}
     if {{ source }} is None:

openapi_python_client/templates/property_templates/model_property.pyi

@@ -23,7 +23,7 @@ if _{{ property.python_name }} is not None and not isinstance(_{{ property.pytho
 {{ destination }} = {{ source }}.to_dict()
 {% endif %}
 {% else %}
-{{ destination }}{% if declare_type %}: Union[{% if property.nullable or query_parameter %}None, {% endif %}Unset, Dict[str, Any]]{% endif %} = UNSET
+{{ destination }}{% if declare_type %}: {{ property.get_type_string(query_parameter=query_parameter, json=True) }}{% endif %} = UNSET
 if not isinstance({{ source }}, Unset):
 {% if property.nullable or query_parameter %}
     {{ destination }} = {{ source }}.to_dict() if {{ source }} else None

openapi_python_client/templates/property_templates/union_property.pyi

@@ -26,7 +26,7 @@ def _parse_{{ property.python_name }}(data: Any) -> {{ property.get_type_string(
 
 {% macro transform(property, source, destination, declare_type=True, query_parameter=False) %}
 {% if not property.required or property.nullable %}
-{{ destination }}{% if declare_type %}: {{ property.get_type_string(query_parameter=query_parameter) }}{% endif %}
+{{ destination }}{% if declare_type %}: {{ property.get_type_string(query_parameter=query_parameter, json=True) }}{% endif %}
 
 if isinstance({{ source }}, Unset):
     {{ destination }} = UNSET

openapi_python_client/templates/types.py

@@ -11,6 +11,9 @@ def __bool__(self) -> bool:
 
 UNSET: Unset = Unset()
 
+# Used as `FileProperty._json_type_string`
+FileJsonType = Tuple[Optional[str], Union[BinaryIO, TextIO], Optional[str]]
+
 
 @attr.s(auto_attribs=True)
 class File:
@@ -20,7 +23,7 @@ class File:
     file_name: Optional[str] = None
     mime_type: Optional[str] = None
 
-    def to_tuple(self) -> Tuple[Optional[str], Union[BinaryIO, TextIO], Optional[str]]:
+    def to_tuple(self) -> FileJsonType:
         """ Return a tuple representation that httpx will accept for multipart/form-data """
         return self.file_name, self.payload, self.mime_type