fix: Declaring types is necessary

Author: Constantinos Symeonides

Diff for: end_to_end_tests/golden-record/my_test_api_client/models/body_upload_file_tests_upload_post.py

@@ -1,6 +1,6 @@
 import json
 from io import BytesIO
-from typing import Any, Dict, List, Optional, Type, TypeVar, Union, cast
+from typing import Any, Dict, List, Optional, Tuple, Type, TypeVar, Union, cast
 
 import attr
 
@@ -76,18 +76,18 @@ def to_multipart(self) -> Dict[str, Any]:
 
         some_object = (None, json.dumps(self.some_object.to_dict()), "application/json")
 
-        some_optional_file = UNSET
+        some_optional_file: Union[Unset, FileJsonType] = UNSET
         if not isinstance(self.some_optional_file, Unset):
             some_optional_file = self.some_optional_file.to_tuple()
 
         some_string = self.some_string
         some_number = self.some_number
-        some_array = UNSET
+        some_array: Union[Unset, Tuple[None, str, str]] = UNSET
         if not isinstance(self.some_array, Unset):
-            some_array = self.some_array
-            some_array = (None, json.dumps(some_array), "application/json")
+            _temp_some_array = self.some_array
+            some_array = (None, json.dumps(_temp_some_array), "application/json")
 
-        some_optional_object = UNSET
+        some_optional_object: Union[Unset, Tuple[None, str, str]] = UNSET
         if not isinstance(self.some_optional_object, Unset):
             some_optional_object = (None, json.dumps(self.some_optional_object.to_dict()), "application/json")
 

Diff for: openapi_python_client/templates/model.py.jinja

@@ -47,7 +47,7 @@ class {{ class_name }}:
 {% for property in model.required_properties + model.optional_properties %}
 {% if property.template %}
 {% from "property_templates/" + property.template import transform %}
-{{ transform(property, "self." + property.python_name, property.python_name, declare_type=not multipart, stringify=multipart) }}
+{{ transform(property, "self." + property.python_name, property.python_name, stringify=multipart) }}
 {% else %}
 {{ property.python_name }} = self.{{ property.python_name }}
 {% endif %}
@@ -58,7 +58,7 @@ field_dict: Dict[str, Any] = {}
 {% if model.additional_properties.template %}
 {% from "property_templates/" + model.additional_properties.template import transform %}
 for prop_name, prop in self.additional_properties.items():
-    {{ transform(model.additional_properties, "prop", "field_dict[prop_name]", declare_type=not multipart, stringify=multipart) | indent(4) }}
+    {{ transform(model.additional_properties, "prop", "field_dict[prop_name]", stringify=multipart) | indent(4) }}
 {% else %}
 field_dict.update(self.additional_properties)
 {% endif %}

Diff for: openapi_python_client/templates/property_templates/list_property.py.jinja

@@ -19,6 +19,10 @@ for {{ inner_source }} in (_{{ property.python_name }} or []):
 
 {% macro _transform(property, source, destination, stringify) %}
 {% set inner_property = property.inner_property %}
+{% if stringify %}
+{% set stringified_destination = destination %}
+{% set destination = "_temp_" + destination %}
+{% endif %}
 {% if inner_property.template %}
 {% set inner_source = inner_property.python_name + "_data" %}
 {{ destination }} = []
@@ -30,14 +34,18 @@ for {{ inner_source }} in {{ source }}:
 {{ destination }} = {{ source }}
 {% endif %}
 {% if stringify %}
-{{ destination }} = (None, json.dumps({{ destination }}), 'application/json')
+{{ stringified_destination }} = (None, json.dumps({{ destination }}), 'application/json')
 {% endif %}
 {% endmacro %}
 
 {% macro check_type_for_construct(property, source) %}isinstance({{ source }}, list){% endmacro %}
 
 {% macro transform(property, source, destination, declare_type=True, stringify=False) %}
 {% set inner_property = property.inner_property %}
+{% set type_string = property.get_type_string(json=True) %}
+{% if stringify %}
+    {% set type_string = "Union[Unset, Tuple[None, str, str]]" %}
+{% endif %}
 {% if property.required %}
 {% if property.nullable %}
 if {{ source }} is None:
@@ -48,7 +56,7 @@ else:
 {{ _transform(property, source, destination, stringify) }}
 {% endif %}
 {% else %}
-{{ destination }}{% if declare_type %}: {{ property.get_type_string(json=True) }}{% endif %} = UNSET
+{{ destination }}{% if declare_type %}: {{ type_string }}{% endif %} = UNSET
 if not isinstance({{ source }}, Unset):
 {% if property.nullable %}
     if {{ source }} is None:

Diff for: openapi_python_client/templates/property_templates/model_property.py.jinja

@@ -12,8 +12,10 @@
 
 {% macro transform(property, source, destination, declare_type=True, stringify=False, transform_method="to_dict") %}
 {% set transformed = source + "." + transform_method + "()" %}
+{% set type_string = property.get_type_string(json=True) %}
 {% if stringify %}
-{% set transformed = "(None, json.dumps(" + transformed + "), 'application/json')" %}
+    {% set transformed = "(None, json.dumps(" + transformed + "), 'application/json')" %}
+    {% set type_string = "Union[Unset, Tuple[None, str, str]]" %}
 {% endif %}
 {% if property.required %}
 {% if property.nullable %}
@@ -22,7 +24,7 @@
 {{ destination }} = {{ transformed }}
 {% endif %}
 {% else %}
-{{ destination }}{% if declare_type %}: {{ property.get_type_string(json=True) }}{% endif %} = UNSET
+{{ destination }}{% if declare_type %}: {{ type_string }}{% endif %} = UNSET
 if not isinstance({{ source }}, Unset):
 {% if property.nullable %}
     {{ destination }} = {{ transformed }} if {{ source }} else None