Fix for union property

Reduce indent of inner properties
Don't declare type on call-out to subtemplate

Author: packyg

openapi_python_client/templates/property_templates/date_property.pyi

@@ -8,15 +8,15 @@ if {{ source }} is not None:
 {% endif %}
 {% endmacro %}
 
-{% macro transform(property, source, destination) %}
+{% macro transform(property, source, destination, declare_type=True) %}
 {% if property.required %}
 {% if property.nullable %}
 {{ destination }} = {{ source }}.isoformat() if {{ source }} else None
 {% else %}
 {{ destination }} = {{ source }}.isoformat()
 {% endif %}
 {% else %}
-{{ destination }}: Union[Unset, str] = UNSET
+{{ destination }}{% if declare_type %}: Union[Unset, str]{% endif %} = UNSET
 if not isinstance({{ source }}, Unset):
 {% if property.nullable %}
     {{ destination }} = {{ source }}.isoformat() if {{ source }} else None

openapi_python_client/templates/property_templates/datetime_property.pyi

@@ -8,15 +8,15 @@ if {{ source }} is not None:
 {% endif %}
 {% endmacro %}
 
-{% macro transform(property, source, destination) %}
+{% macro transform(property, source, destination, declare_type=True) %}
 {% if property.required %}
 {% if property.nullable %}
 {{ destination }} = {{ source }}.isoformat() if {{ source }} else None
 {% else %}
 {{ destination }} = {{ source }}.isoformat()
 {% endif %}
 {% else %}
-{{ destination }}: Union[Unset, str] = UNSET
+{{ destination }}{% if declare_type %}: Union[Unset, str]{% endif %} = UNSET
 if not isinstance({{ source }}, Unset):
 {% if property.nullable %}
     {{ destination }} = {{ source }}.isoformat() if {{ source }} else None

openapi_python_client/templates/property_templates/dict_property.pyi

@@ -8,7 +8,7 @@ if {{ source }} is not None:
 {% endif %}
 {% endmacro %}
 
-{% macro transform(property, source, destination) %}
+{% macro transform(property, source, destination, declare_type=True) %}
 {% if property.nullable %}
 {{ destination }} = {{ source }} if {{ source }} else None
 {% else %}

openapi_python_client/templates/property_templates/enum_property.pyi

@@ -8,15 +8,15 @@ if {{ source }} is not None:
 {% endif %}
 {% endmacro %}
 
-{% macro transform(property, source, destination) %}
+{% macro transform(property, source, destination, declare_type=True) %}
 {% if property.required %}
 {% if property.nullable %}
 {{ destination }} = {{ source }}.value if {{ source }} else None
 {% else %}
 {{ destination }} = {{ source }}.value
 {% endif %}
 {% else %}
-{{ destination }}: {{ property.get_type_string() }} = UNSET
+{{ destination }}{% if declare_type %}: {{ property.get_type_string() }}{% endif %} = UNSET
 if not isinstance({{ source }}, Unset):
 {% if property.nullable %}
     {{ destination }} = {{ source }}.value if {{ source }} else None

openapi_python_client/templates/property_templates/file_property.pyi

@@ -4,15 +4,15 @@
 )
 {% endmacro %}
 
-{% macro transform(property, source, destination) %}
+{% macro transform(property, source, destination, declare_type=True) %}
 {% if property.required %}
 {% if property.nullable %}
 {{ destination }} = {{ source }}.to_tuple() if {{ source }} else None
 {% else %}
 {{ destination }} = {{ source }}.to_tuple()
 {% endif %}
 {% else %}
-{{ destination }}: {{ property.get_type_string() }} = UNSET
+{{ destination }}{% if declare_type %}: {{ property.get_type_string() }}{% endif %} = UNSET
 if not isinstance({{ source }}, Unset):
 {% if property.nullable %}
     {{ destination }} = {{ source }}.to_tuple() if {{ source }} else None

openapi_python_client/templates/property_templates/list_property.pyi

@@ -31,7 +31,7 @@ for {{ inner_source }} in {{ source }}:
 {% endmacro %}
 
 
-{% macro transform(property, source, destination) %}
+{% macro transform(property, source, destination, declare_type=True) %}
 {% set inner_property = property.inner_property %}
 {% if property.required %}
 {% if property.nullable %}
@@ -43,7 +43,7 @@ else:
 {{ _transform(property, source, destination) }}
 {% endif %}
 {% else %}
-{{ destination }}: Union[Unset, List[Any]] = UNSET
+{{ destination }}{% if declare_type %}: Union[Unset, List[Any]]{% endif %} = UNSET
 if not isinstance({{ source }}, Unset):
 {% if property.nullable %}
     if {{ source }} is None:

openapi_python_client/templates/property_templates/model_property.pyi

@@ -8,15 +8,15 @@ if {{ source }} is not None:
 {% endif %}
 {% endmacro %}
 
-{% macro transform(property, source, destination) %}
+{% macro transform(property, source, destination, declare_type=True) %}
 {% if property.required %}
 {% if property.nullable %}
 {{ destination }} = {{ source }}.to_dict() if {{ source }} else None
 {% else %}
 {{ destination }} = {{ source }}.to_dict()
 {% endif %}
 {% else %}
-{{ destination }}: {{ property.get_type_string() }} = UNSET
+{{ destination }}{% if declare_type %}: {{ property.get_type_string() }}{% endif %} = UNSET
 if not isinstance({{ source }}, Unset):
 {% if property.nullable %}
     {{ destination }} = {{ source }}.to_dict() if {{ source }} else None

openapi_python_client/templates/property_templates/none_property.pyi

@@ -2,6 +2,6 @@
 {{ property.python_name }} = None
 {% endmacro %}
 
-{% macro transform(property, source, destination) %}
+{% macro transform(property, source, destination, declare_type=True) %}
 {{ destination }} =  None
 {% endmacro %}

openapi_python_client/templates/property_templates/union_property.pyi

@@ -21,9 +21,10 @@ def _parse_{{ property.python_name }}(data: Dict[str, Any]) -> {{ property.get_t
 {{ property.python_name }} = _parse_{{ property.python_name }}({{ source }})
 {% endmacro %}
 
-{% macro transform(property, source, destination) %}
+{% macro transform(property, source, destination, declare_type=True) %}
 {% if not property.required %}
-{{ destination }}: {{ property.get_type_string() }}
+{{ destination }}{% if declare_type %}: {{ property.get_type_string() }}{% endif %}
+
 if isinstance({{ source }}, Unset):
     {{ destination }} = UNSET
 {% endif %}
@@ -33,7 +34,7 @@ if {{ source }} is None:
 {% else %}{# There's an if UNSET statement before this #}
 elif {{ source }} is None:
 {% endif %}
-    {{ destination }}: {{ property.get_type_string() }} = None
+    {{ destination }}{% if declare_type %}: {{ property.get_type_string() }}{% endif %} = None
 {% endif %}
 {% for inner_property in property.inner_properties %}
     {% if loop.first and property.required and not property.nullable %}{# No if UNSET or if None statement before this #}
@@ -45,7 +46,7 @@ else:
     {% endif %}
 {% if inner_property.template %}
 {% from "property_templates/" + inner_property.template import transform %}
-    {{ transform(inner_property, source, destination) | indent(4) }}
+    {{ transform(inner_property, source, destination, declare_type=False) | indent(4) }}
 {% else %}
     {{ destination }} = {{ source }}
 {% endif %}