Fix tests

end_to_end_tests/golden-record-custom/custom_e2e/models/model_with_union_property.py

@@ -45,21 +45,21 @@ def _parse_a_property(data: Union[Unset, str, int]) -> Union[Unset, AnEnum, AnIn
             if isinstance(data, Unset):
                 return data
             try:
-                if not (isinstance(data, int) or isinstance(data, str)):
+                if not isinstance(data, int):
                     raise TypeError()
                 a_property = UNSET
                 _a_property = data
-                if _a_property is not None and _a_property is not UNSET:
+                if _a_property is not None and _a_property is not UNSET:  # type: ignore
                     a_property = AnEnum(_a_property)
 
                 return a_property
             except:  # noqa: E722
                 pass
-            if not (isinstance(data, int) or isinstance(data, str)):
+            if not isinstance(data, int):
                 raise TypeError()
             a_property = UNSET
             _a_property = data
-            if _a_property is not None and _a_property is not UNSET:
+            if _a_property is not None and _a_property is not UNSET:  # type: ignore
                 a_property = AnIntEnum(_a_property)
 
             return a_property

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

@@ -45,21 +45,21 @@ def _parse_a_property(data: Union[Unset, str, int]) -> Union[Unset, AnEnum, AnIn
             if isinstance(data, Unset):
                 return data
             try:
-                if not (isinstance(data, int) or isinstance(data, str)):
+                if not isinstance(data, int):
                     raise TypeError()
                 a_property = UNSET
                 _a_property = data
-                if _a_property is not None and _a_property is not UNSET:
+                if _a_property is not None and _a_property is not UNSET:  # type: ignore
                     a_property = AnEnum(_a_property)
 
                 return a_property
             except:  # noqa: E722
                 pass
-            if not (isinstance(data, int) or isinstance(data, str)):
+            if not isinstance(data, int):
                 raise TypeError()
             a_property = UNSET
             _a_property = data
-            if _a_property is not None and _a_property is not UNSET:
+            if _a_property is not None and _a_property is not UNSET:  # type: ignore
                 a_property = AnIntEnum(_a_property)
 
             return a_property

openapi_python_client/templates/property_templates/date_property.py.jinja

@@ -9,7 +9,7 @@ if _{{ property.python_name }} is not None:
 {% endif %}
 {% endmacro %}
 
-{% macro check_type_for_construct(source) %}isinstance({{ source }}, str){% endmacro %}
+{% macro check_type_for_construct(property, source) %}isinstance({{ source }}, str){% endmacro %}
 
 {% macro transform(property, source, destination, declare_type=True) %}
 {% if property.required %}

openapi_python_client/templates/property_templates/datetime_property.py.jinja

@@ -14,7 +14,7 @@ if _{{ property.python_name }} is not None:
 {% endif %}
 {% endmacro %}
 
-{% macro check_type_for_construct(source) %}isinstance({{ source }}, str){% endmacro %}
+{% macro check_type_for_construct(property, source) %}isinstance({{ source }}, str){% endmacro %}
 
 {% macro transform(property, source, destination, declare_type=True) %}
 {% if property.required %}

openapi_python_client/templates/property_templates/enum_property.py.jinja

@@ -1,15 +1,15 @@
 {% macro construct(property, source, initial_value="None") %}
-{% if property.required %}
+{% if property.required and not property.nullable %}
 {{ property.python_name }} = {{ property.reference.class_name }}({{ source }})
 {% else %}
 {{ property.python_name }} = {{ initial_value }}
 _{{ property.python_name }} = {{ source }}
-if _{{ property.python_name }} is not None and _{{ property.python_name }} is not UNSET:
+if _{{ property.python_name }} is not None and _{{ property.python_name }} is not UNSET:  # type: ignore
     {{ property.python_name }} = {{ property.reference.class_name }}(_{{ property.python_name }})
 {% endif %}
 {% endmacro %}
 
-{% macro check_type_for_construct(source) %}(isinstance({{ source }}, int) or isinstance({{ source }}, str)){% endmacro %}
+{% macro check_type_for_construct(property, source) %}{% if property.value_type == str %}isinstance({{ source }}, str){% else %}isinstance({{ source }}, int){% endif %}{% endmacro %}
 
 {% macro transform(property, source, destination, declare_type=True) %}
 {% if property.required %}

openapi_python_client/templates/property_templates/file_property.py.jinja

@@ -4,7 +4,7 @@
 )
 {% endmacro %}
 
-{% macro check_type_for_construct(source) %}isinstance({{ source }}, bytes){% endmacro %}
+{% macro check_type_for_construct(property, source) %}isinstance({{ source }}, bytes){% endmacro %}
 
 {% macro transform(property, source, destination, declare_type=True) %}
 {% if property.required %}

openapi_python_client/templates/property_templates/list_property.py.jinja

@@ -31,7 +31,7 @@ for {{ inner_source }} in {{ source }}:
 {% endif %}
 {% endmacro %}
 
-{% macro check_type_for_construct(source) %}isinstance({{ source }}, list){% endmacro %}
+{% macro check_type_for_construct(property, source) %}isinstance({{ source }}, list){% endmacro %}
 
 {% macro transform(property, source, destination, declare_type=True) %}
 {% set inner_property = property.inner_property %}

openapi_python_client/templates/property_templates/model_property.py.jinja

@@ -15,7 +15,7 @@ if {% if property.nullable %}_{{ property.python_name }} is not None{% endif %}{
 {% endif %}
 {% endmacro %}
 
-{% macro check_type_for_construct(source) %}isinstance({{ source }}, dict){% endmacro %}
+{% macro check_type_for_construct(property, source) %}isinstance({{ source }}, dict){% endmacro %}
 
 {% macro transform(property, source, destination, declare_type=True) %}
 {% if property.required %}

openapi_python_client/templates/property_templates/none_property.py.jinja

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

openapi_python_client/templates/property_templates/union_property.py.jinja

@@ -13,15 +13,15 @@ def _parse_{{ property.python_name }}(data: {{ property.get_type_string(json=Tru
     {% if 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("data") }}:
+        if not {{ check_type_for_construct(inner_property, "data") }}:
             raise TypeError()
         {{ construct(inner_property, "data", initial_value="UNSET") | indent(8) }}
         return {{ 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("data") }}:
+    if not {{ check_type_for_construct(inner_property, "data") }}:
         raise TypeError()
     {{ construct(inner_property, "data", initial_value="UNSET") | indent(4) }}
     return {{ property.python_name }}
@@ -36,7 +36,7 @@ def _parse_{{ property.python_name }}(data: {{ property.get_type_string(json=Tru
 {% endmacro %}
 
 {# For now we assume there will be no unions of unions #}
-{% macro check_type_for_construct(source) %}True{% endmacro %}
+{% macro check_type_for_construct(property, source) %}True{% endmacro %}
 
 {% macro transform(property, source, destination, declare_type=True) %}
 {% if not property.required or property.nullable %}