Fixed typing issues (again)

Author: emann

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

@@ -21,42 +21,39 @@ def _get_kwargs(
     int_prop: Union[Unset, int] = 7,
     boolean_prop: Union[Unset, bool] = UNSET,
     list_prop: Union[Unset, List[AnEnum]] = UNSET,
-    union_prop: Union[Unset, Union[Union[Unset, float], Union[Unset, str]]] = "not a float",
+    union_prop: Union[Unset, Union[float, str]] = "not a float",
     enum_prop: Union[Unset, AnEnum] = UNSET,
 ) -> Dict[str, Any]:
     url = "{}/tests/defaults".format(client.base_url)
 
     headers: Dict[str, Any] = client.get_headers()
 
-    if datetime_prop is UNSET:
-        json_datetime_prop = UNSET
-    else:
+    json_datetime_prop: Union[Unset, str] = UNSET
+    if not isinstance(datetime_prop, Unset):
         json_datetime_prop = datetime_prop.isoformat()
 
-    if date_prop is UNSET:
-        json_date_prop = UNSET
-    else:
+    json_date_prop: Union[Unset, str] = UNSET
+    if not isinstance(date_prop, Unset):
         json_date_prop = date_prop.isoformat()
 
-    if list_prop is UNSET:
-        json_list_prop = UNSET
-    else:
+    json_list_prop: Union[Unset, List[Any]] = UNSET
+    if not isinstance(list_prop, Unset):
         json_list_prop = []
         for list_prop_item_data in list_prop:
             list_prop_item = list_prop_item_data.value
 
             json_list_prop.append(list_prop_item)
 
-    if union_prop is UNSET:
-        json_union_prop: Union[Unset, Union[Union[Unset, float], Union[Unset, str]]] = UNSET
+    json_union_prop: Union[Unset, Union[float, str]]
+    if isinstance(union_prop, Unset):
+        json_union_prop = UNSET
     elif isinstance(union_prop, float):
         json_union_prop = union_prop
     else:
         json_union_prop = union_prop
 
-    if enum_prop is UNSET:
-        json_enum_prop = UNSET
-    else:
+    json_enum_prop: Union[Unset, AnEnum] = UNSET
+    if not isinstance(enum_prop, Unset):
         json_enum_prop = enum_prop.value
 
     params: Dict[str, Any] = {}
@@ -119,7 +116,7 @@ def sync_detailed(
     int_prop: Union[Unset, int] = 7,
     boolean_prop: Union[Unset, bool] = UNSET,
     list_prop: Union[Unset, List[AnEnum]] = UNSET,
-    union_prop: Union[Unset, Union[Union[Unset, float], Union[Unset, str]]] = "not a float",
+    union_prop: Union[Unset, Union[float, str]] = "not a float",
     enum_prop: Union[Unset, AnEnum] = UNSET,
 ) -> Response[Union[None, HTTPValidationError]]:
     kwargs = _get_kwargs(
@@ -154,7 +151,7 @@ def sync(
     int_prop: Union[Unset, int] = 7,
     boolean_prop: Union[Unset, bool] = UNSET,
     list_prop: Union[Unset, List[AnEnum]] = UNSET,
-    union_prop: Union[Unset, Union[Union[Unset, float], Union[Unset, str]]] = "not a float",
+    union_prop: Union[Unset, Union[float, str]] = "not a float",
     enum_prop: Union[Unset, AnEnum] = UNSET,
 ) -> Optional[Union[None, HTTPValidationError]]:
     """  """
@@ -185,7 +182,7 @@ async def asyncio_detailed(
     int_prop: Union[Unset, int] = 7,
     boolean_prop: Union[Unset, bool] = UNSET,
     list_prop: Union[Unset, List[AnEnum]] = UNSET,
-    union_prop: Union[Unset, Union[Union[Unset, float], Union[Unset, str]]] = "not a float",
+    union_prop: Union[Unset, Union[float, str]] = "not a float",
     enum_prop: Union[Unset, AnEnum] = UNSET,
 ) -> Response[Union[None, HTTPValidationError]]:
     kwargs = _get_kwargs(
@@ -219,7 +216,7 @@ async def asyncio(
     int_prop: Union[Unset, int] = 7,
     boolean_prop: Union[Unset, bool] = UNSET,
     list_prop: Union[Unset, List[AnEnum]] = UNSET,
-    union_prop: Union[Unset, Union[Union[Unset, float], Union[Unset, str]]] = "not a float",
+    union_prop: Union[Unset, Union[float, str]] = "not a float",
     enum_prop: Union[Unset, AnEnum] = UNSET,
 ) -> Optional[Union[None, HTTPValidationError]]:
     """  """

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

@@ -16,9 +16,8 @@ def _get_kwargs(
 
     headers: Dict[str, Any] = client.get_headers()
 
-    if query_param is UNSET:
-        json_query_param = UNSET
-    else:
+    json_query_param: Union[Unset, List[Any]] = UNSET
+    if not isinstance(query_param, Unset):
         json_query_param = query_param
 
     params: Dict[str, Any] = {}

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

@@ -36,13 +36,10 @@ def to_dict(self) -> Dict[str, Any]:
         a_date = self.a_date.isoformat()
 
         required_not_nullable = self.required_not_nullable
-
-        if self.nested_list_of_enums is UNSET:
-            nested_list_of_enums = UNSET
-        else:
+        nested_list_of_enums: Union[Unset, List[Any]] = UNSET
+        if not isinstance(self.nested_list_of_enums, Unset):
             nested_list_of_enums = []
             for nested_list_of_enums_item_data in self.nested_list_of_enums:
-
                 nested_list_of_enums_item = []
                 for nested_list_of_enums_item_item_data in nested_list_of_enums_item_data:
                     nested_list_of_enums_item_item = nested_list_of_enums_item_item_data.value

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

@@ -13,10 +13,8 @@ class HTTPValidationError:
     detail: Union[Unset, List[ValidationError]] = UNSET
 
     def to_dict(self) -> Dict[str, Any]:
-
-        if self.detail is UNSET:
-            detail = UNSET
-        else:
+        detail: Union[Unset, List[Any]] = UNSET
+        if not isinstance(self.detail, Unset):
             detail = []
             for detail_item_data in self.detail:
                 detail_item = detail_item_data.to_dict()

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

@@ -12,7 +12,6 @@ class ValidationError:
     type: str
 
     def to_dict(self) -> Dict[str, Any]:
-
         loc = self.loc
 
         msg = self.msg

openapi_python_client/parser/properties.py

@@ -229,7 +229,7 @@ def get_type_string(self, no_optional: bool = False, no_unset: bool = False) ->
         """ Get a string representation of type that should be used when declaring this property """
         type_string = f"List[{self.inner_property.get_type_string()}]"
         if not no_optional and self.nullable:
-            type_string = f"Optional[{type_string}]" 
+            type_string = f"Optional[{type_string}]"
         if not no_unset and not self.required:
             type_string = f"Union[Unset, {type_string}]"
         return type_string
@@ -260,7 +260,7 @@ class UnionProperty(Property):
 
     def get_type_string(self, no_optional: bool = False, no_unset: bool = False) -> str:
         """ Get a string representation of type that should be used when declaring this property """
-        inner_types = [p.get_type_string() for p in self.inner_properties]
+        inner_types = [p.get_type_string(no_unset=True) for p in self.inner_properties]
         inner_prop_string = ", ".join(inner_types)
         type_string = f"Union[{inner_prop_string}]"
         if not no_optional and self.nullable:

openapi_python_client/templates/property_templates/date_property.pyi

@@ -16,13 +16,11 @@ if {{ source }} is not None:
 {{ destination }} = {{ source }}.isoformat()
 {% endif %}
 {% else %}
-if {{ source }} is UNSET:
-    {{ destination }} = UNSET
+{{ destination }}: Union[Unset, str] = UNSET
+if not isinstance({{ source }}, Unset):
 {% if property.nullable %}
-else:
     {{ destination }} = {{ source }}.isoformat() if {{ source }} else None
 {% else %}
-else:
     {{ destination }} = {{ source }}.isoformat()
 {% endif %}
 {% endif %}

openapi_python_client/templates/property_templates/datetime_property.pyi

@@ -16,13 +16,11 @@ if {{ source }} is not None:
 {{ destination }} = {{ source }}.isoformat()
 {% endif %}
 {% else %}
-if {{ source }} is UNSET:
-    {{ destination }} = UNSET
+{{ destination }}: Union[Unset, str] = UNSET
+if not isinstance({{ source }}, Unset):
 {% if property.nullable %}
-else:
     {{ destination }} = {{ source }}.isoformat() if {{ source }} else None
 {% else %}
-else:
     {{ destination }} = {{ source }}.isoformat()
 {% endif %}
 {% endif %}

openapi_python_client/templates/property_templates/enum_property.pyi

@@ -16,13 +16,11 @@ if {{ source }} is not None:
 {{ destination }} = {{ source }}.value
 {% endif %}
 {% else %}
-if {{ source }} is UNSET:
-    {{ destination }} = UNSET
+{{ destination }}: {{ property.get_type_string() }} = UNSET
+if not isinstance({{ source }}, Unset):
 {% if property.nullable %}
-else:
     {{ destination }} = {{ source }}.value if {{ source }} else None
 {% else %}
-else:
     {{ destination }} = {{ source }}.value
 {% endif %}
 {% endif %}

openapi_python_client/templates/property_templates/file_property.pyi

@@ -11,13 +11,11 @@
 {{ destination }} = {{ source }}.to_tuple()
 {% endif %}
 {% else %}
-if {{ source }} is UNSET:
-    {{ destination }} = UNSET
+{{ destination }}: {{ property.get_type_string() }} = UNSET
+if not isinstance({{ source }}, Unset):
 {% if property.nullable %}
-else:
     {{ destination }} = {{ source }}.to_tuple() if {{ source }} else None
 {% else %}
-else:
     {{ destination }} = {{ source }}.to_tuple()
 {% endif %}
 {% endif %}

openapi_python_client/templates/property_templates/list_property.pyi

@@ -33,8 +33,6 @@ for {{ inner_source }} in {{ source }}:
 
 {% macro transform(property, source, destination) %}
 {% set inner_property = property.inner_property %}
-
-
 {% if property.required %}
 {% if property.nullable %}
 if {{ source }} is None:
@@ -45,15 +43,17 @@ else:
 {{ _transform(property, source, destination) }}
 {% endif %}
 {% else %}
-if {{ source }} is UNSET:
-    {{ destination }} = UNSET
+{{ destination }}: Union[Unset, List[Any]] = UNSET
+if not isinstance({{ source }}, Unset):
 {% if property.nullable %}
-elif {{ source }} is None:
-    {{ destination }} = None
-{% endif %}
-else:
+    if {{ source }} is None:
+        {{ destination }} = None
+    else:
+        {{ _transform(property, source, destination) | indent(4)}}
+{% else %}
     {{ _transform(property, source, destination) | indent(4)}}
 {% endif %}
+{% endif %}
 
 
 {% endmacro %}

openapi_python_client/templates/property_templates/ref_property.pyi

@@ -16,13 +16,11 @@ if {{ source }} is not None:
 {{ destination }} = {{ source }}.to_dict()
 {% endif %}
 {% else %}
-if {{ source }} is UNSET:
-    {{ destination }} = UNSET
+{{ destination }}: {{ property.get_type_string() }} = UNSET
+if not isinstance({{ source }}, Unset):
 {% if property.nullable %}
-else:
     {{ destination }} = {{ source }}.to_dict() if {{ source }} else None
 {% else %}
-else:
     {{ destination }} = {{ source }}.to_dict()
 {% endif %}
 {% endif %}

openapi_python_client/templates/property_templates/union_property.pyi

@@ -23,8 +23,9 @@ def _parse_{{ property.python_name }}(data: Dict[str, Any]) -> {{ property.get_t
 
 {% macro transform(property, source, destination) %}
 {% if not property.required %}
-if {{ source }} is UNSET:
-    {{ destination }}: {{ property.get_type_string() }} = UNSET
+{{ destination }}: {{ property.get_type_string() }}
+if isinstance({{ source }}, Unset):
+    {{ destination }} = UNSET
 {% endif %}
 {% if property.nullable %}
 {% if property.required %}

openapi_python_client/templates/types.py

@@ -1,10 +1,13 @@
 """ Contains some shared types for properties """
-from typing import Any, BinaryIO, Generic, MutableMapping, NewType, Optional, TextIO, Tuple, TypeVar, Union
+from typing import BinaryIO, Generic, MutableMapping, Optional, TextIO, Tuple, TypeVar, Union
 
 import attr
 
+
 class Unset:
     pass
+
+
 UNSET: Unset = Unset()