fix: Remove need for unnecessary if True when constructing unions of Any properties.

Author: dbanty

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

@@ -230,8 +230,6 @@ def _parse_one_of_models(data: object) -> Union[Any, FreeFormModel, ModelWithUni
                 return one_of_models_type_1
             except:  # noqa: E722
                 pass
-            if not True:
-                raise TypeError()
             one_of_models_type_2 = data
 
             return one_of_models_type_2

openapi_python_client/templates/property_templates/any_property.py.jinja

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

openapi_python_client/templates/property_templates/union_property.py.jinja

@@ -9,20 +9,21 @@ def _parse_{{ property.python_name }}(data: object) -> {{ property.get_type_stri
         return data
     {% endif %}
     {% for inner_property in property.inner_properties_with_template() %}
-    {% if not loop.last or property.has_properties_without_templates %}
+    {% import "property_templates/" + inner_property.template as inner_template %}
+    {% if inner_template.check_type_for_construct and (not loop.last or property.has_properties_without_templates) %}
     try:
-    {% from "property_templates/" + inner_property.template import construct, check_type_for_construct %}
-        if not {{ check_type_for_construct(inner_property, "data") }}:
+        if not {{ inner_template.check_type_for_construct(inner_property, "data") }}:
             raise TypeError()
-        {{ construct(inner_property, "data", initial_value="UNSET") | indent(8) }}
+        {{ inner_template.construct(inner_property, "data", initial_value="UNSET") | indent(8) }}
         return {{ inner_property.python_name }}
     except: # noqa: E722
         pass
-    {% else  %}{# Don't do try/except for the last one #}
-    {% from "property_templates/" + inner_property.template import construct, check_type_for_construct %}
-    if not {{ check_type_for_construct(inner_property, "data") }}:
+    {% else  %}{# Don't do try/except for the last one nor any properties with no type checking #}
+    {% if inner_template.check_type_for_construct %}
+    if not {{ inner_template.check_type_for_construct(inner_property, "data") }}:
         raise TypeError()
-    {{ construct(inner_property, "data", initial_value="UNSET") | indent(4) }}
+    {% endif %}
+    {{ inner_template.construct(inner_property, "data", initial_value="UNSET") | indent(4) }}
     return {{ inner_property.python_name }}
     {% endif %}
     {% endfor %}
@@ -34,9 +35,6 @@ def _parse_{{ property.python_name }}(data: object) -> {{ property.get_type_stri
 {{ property.python_name }} = _parse_{{ property.python_name }}({{ source }})
 {% endmacro %}
 
-{# For now we assume there will be no unions of unions #}
-{% macro check_type_for_construct(property, source) %}True{% endmacro %}
-
 {% macro transform(property, source, destination, declare_type=True, stringify=False) %}
 {% if not property.required or property.nullable %}
 {{ destination }}{% if declare_type %}: {{ property.get_type_string(json=True) }}{% endif %}