Update templates construct to allow different initial value, use in union property

Author: packyg

openapi_python_client/templates/property_templates/date_property.pyi

@@ -1,8 +1,8 @@
-{% macro construct(property, source) %}
+{% macro construct(property, source, initial_value="None") %}
 {% if property.required %}
 {{ property.python_name }} = isoparse({{ source }}).date()
 {% else %}
-{{ property.python_name }} = None
+{{ property.python_name }} = {{ initial_value }}
 if {{ source }} is not None:
     {{ property.python_name }} = isoparse(cast(str, {{ source }})).date()
 {% endif %}

openapi_python_client/templates/property_templates/datetime_property.pyi

@@ -1,8 +1,8 @@
-{% macro construct(property, source) %}
+{% macro construct(property, source, initial_value="None") %}
 {% if property.required %}
 {{ property.python_name }} = isoparse({{ source }})
 {% else %}
-{{ property.python_name }} = None
+{{ property.python_name }} = {{ initial_value }}
 if {{ source }} is not None:
     {{ property.python_name }} = isoparse(cast(str, {{ source }}))
 {% endif %}

openapi_python_client/templates/property_templates/dict_property.pyi

@@ -1,8 +1,8 @@
-{% macro construct(property, source) %}
+{% macro construct(property, source, initial_value="None") %}
 {% if property.required %}
 {{ property.python_name }} = {{ source }}
 {% else %}
-{{ property.python_name }} = None
+{{ property.python_name }} = {{ initial_value }}
 if {{ source }} is not None:
     {{ property.python_name }} = {{ source }}
 {% endif %}

openapi_python_client/templates/property_templates/enum_property.pyi

@@ -1,8 +1,8 @@
-{% macro construct(property, source) %}
+{% macro construct(property, source, initial_value="None") %}
 {% if property.required %}
 {{ property.python_name }} = {{ property.reference.class_name }}({{ source }})
 {% else %}
-{{ property.python_name }} = None
+{{ property.python_name }} = {{ initial_value }}
 if {{ source }} is not None:
     {{ property.python_name }} = {{ property.reference.class_name }}({{ source }})
 {% endif %}
@@ -19,9 +19,9 @@ if {{ source }} is not None:
 {{ 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
+    {{ destination }} = {{ source }} if {{ source }} else None
 {% else %}
-    {{ destination }} = {{ source }}.value
+    {{ destination }} = {{ source }}
 {% endif %}
 {% endif %}
 {% endmacro %}

openapi_python_client/templates/property_templates/file_property.pyi

@@ -1,4 +1,4 @@
-{% macro construct(property, source) %}
+{% macro construct(property, source, initial_value=None) %}
 {{ property.python_name }} = File(
      payload = BytesIO({{ source }})
 )

openapi_python_client/templates/property_templates/list_property.pyi

@@ -1,8 +1,8 @@
-{% macro construct(property, source) %}
+{% macro construct(property, source, initial_value="[]") %}
 {% set inner_property = property.inner_property %}
 {% if inner_property.template %}
 {% set inner_source = inner_property.python_name + "_data" %}
-{{ property.python_name }} = []
+{{ property.python_name }} = {{ initial_value }}
 {% if property.required %}
 for {{ inner_source }} in ({{ source }}):
 {% else %}

openapi_python_client/templates/property_templates/model_property.pyi

@@ -1,8 +1,8 @@
-{% macro construct(property, source) %}
+{% macro construct(property, source, initial_value=None) %}
 {% if property.required %}
 {{ property.python_name }} = {{ property.reference.class_name }}.from_dict({{ source }})
 {% else %}
-{{ property.python_name }} = None
+{{ property.python_name }} = {{ initial_value }}
 if {{ source }} is not None:
     {{ property.python_name }} = {{ property.reference.class_name }}.from_dict(cast(Dict[str, Any], {{ source }}))
 {% endif %}

openapi_python_client/templates/property_templates/none_property.pyi

@@ -1,5 +1,5 @@
-{% macro construct(property, source) %}
-{{ property.python_name }} = None
+{% macro construct(property, source, initial_value="None") %}
+{{ property.python_name }} = {{ initial_value }}
 {% endmacro %}
 
 {% macro transform(property, source, destination, declare_type=True) %}

openapi_python_client/templates/property_templates/union_property.pyi

@@ -1,17 +1,17 @@
-{% macro construct(property, source) %}
-def _parse_{{ property.python_name }}(data: Dict[str, Any]) -> {{ property.get_type_string() }}:
+{% macro construct(property, source, initial_value=None) %}
+def _parse_{{ property.python_name }}(data: Any) -> {{ property.get_type_string() }}:
     {{ property.python_name }}: {{ property.get_type_string() }}
     {% for inner_property in property.inner_properties %}
     {% if inner_property.template and not loop.last %}
     try:
     {% from "property_templates/" + inner_property.template import construct %}
-        {{ construct(inner_property, source) | indent(8) }}
+        {{ construct(inner_property, "data", initial_value="UNSET") | indent(8) }}
         return {{ property.python_name }}
     except: # noqa: E722
         pass
     {% elif inner_property.template and loop.last %}{# Don't do try/except for the last one #}
     {% from "property_templates/" + inner_property.template import construct %}
-    {{ construct(inner_property, source) | indent(4) }}
+    {{ construct(inner_property, "data", initial_value="UNSET") | indent(4) }}
     return {{ property.python_name }}
     {% else %}
     return {{ source }}