Merge upstream/main

openapi_python_client/templates/property_templates/date_property.py.jinja

@@ -10,7 +10,7 @@ isoparse({{ source }}).date()
 
 {% macro check_type_for_construct(property, source) %}isinstance({{ source }}, str){% endmacro %}
 
-{% macro transform(property, source, destination, declare_type=True, query_param=False) %}
+{% macro transform(property, source, destination, declare_type=True, stringify=False, query_param=False) %}
 {% if property.required %}
 {{ destination }} = {{ source }}.isoformat() {% if property.nullable %}if {{ source }} else None {%endif%}
 {% else %}

openapi_python_client/templates/property_templates/datetime_property.py.jinja

@@ -10,7 +10,7 @@ isoparse({{ source }})
 
 {% macro check_type_for_construct(property, source) %}isinstance({{ source }}, str){% endmacro %}
 
-{% macro transform(property, source, destination, declare_type=True, query_param=False) %}
+{% macro transform(property, source, destination, declare_type=True, stringify=False, query_param=False) %}
 {% if property.required %}
 {% if property.nullable %}
 {{ destination }} = {{ source }}.isoformat() if {{ source }} else None

openapi_python_client/templates/property_templates/enum_property.py.jinja

@@ -10,15 +10,21 @@
 
 {% macro check_type_for_construct(property, source) %}isinstance({{ source }}, {{ property.value_type.__name__ }}){% endmacro %}
 
-{% macro transform(property, source, destination, declare_type=True, query_param=False) %}
+{% macro transform(property, source, destination, declare_type=True, stringify=False, query_param=False) %}
+{% set transformed = source + ".value" %}
+{% set type_string = property.get_type_string(json=True) %}
+{% if stringify %}
+    {% set transformed = "(None, str(" + transformed + "), 'text/plain')" %}
+    {% set type_string = "Union[Unset, Tuple[None, str, str]]" %}
+{% endif %}
 {% if property.required %}
 {% if property.nullable %}
 {{ destination }} = {{ transformed }} if {{ source }} else None
 {% else %}
 {{ 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 query_param %} and {{ source }} is not None{% endif %}:
 {% if property.nullable %}
     {{ destination }} = {{ transformed }} if {{ source }} else None

openapi_python_client/templates/property_templates/file_property.py.jinja

@@ -12,7 +12,7 @@ File(
 
 {% macro check_type_for_construct(property, source) %}isinstance({{ source }}, bytes){% endmacro %}
 
-{% macro transform(property, source, destination, declare_type=True, query_param=False) %}
+{% macro transform(property, source, destination, declare_type=True, stringify=False, query_param=False) %}
 {% if property.required %}
 {% if property.nullable %}
 {{ destination }} = {{ source }}.to_tuple() if {{ source }} else None

openapi_python_client/templates/property_templates/list_property.py.jinja

@@ -40,7 +40,7 @@ for {{ inner_source }} in {{ source }}:
 
 {% macro check_type_for_construct(property, source) %}isinstance({{ source }}, list){% endmacro %}
 
-{% macro transform(property, source, destination, declare_type=True, query_param=False) %}
+{% macro transform(property, source, destination, declare_type=True, stringify=False, query_param=False) %}
 {% set inner_property = property.inner_property %}
 {% if stringify %}
     {% set type_string = "Union[Unset, Tuple[None, str, str]]" %}
@@ -57,7 +57,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 query_param %} and {{ source }} is not None{% endif %}:
 {% if property.nullable %}
     if {{ source }} is None:

openapi_python_client/templates/property_templates/model_property.py.jinja

@@ -10,15 +10,22 @@
 
 {% macro check_type_for_construct(property, source) %}isinstance({{ source }}, dict){% endmacro %}
 
-{% macro transform(property, source, destination, declare_type=True, query_param=False) %}
+{% macro transform(property, source, destination, declare_type=True, stringify=False, transform_method="to_dict", query_param=False) %}
+{% set transformed = source + "." + transform_method + "()" %}
+{% if stringify %}
+    {% set transformed = "(None, json.dumps(" + transformed + "), 'application/json')" %}
+    {% set type_string = "Union[Unset, Tuple[None, str, str]]" %}
+{% else %}
+    {% set type_string = property.get_type_string(json=True) %}
+{% endif %}
 {% if property.required %}
 {% if property.nullable %}
 {{ destination }} = {{ transformed }} if {{ source }} else None
 {% else %}
 {{ 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 query_param %} and {{ source }} is not None{% endif %}:
 {% if property.nullable %}
     {{ destination }} = {{ transformed }} if {{ source }} else None

openapi_python_client/templates/property_templates/none_property.py.jinja

@@ -4,6 +4,6 @@
 
 {% macro check_type_for_construct(property, source) %}{{ source }} is None{% endmacro %}
 
-{% macro transform(property, source, destination, declare_type=True, query_param=False) %}
+{% macro transform(property, source, destination, declare_type=True, stringify=False, query_param=False) %}
 {{ destination }} =  None
 {% endmacro %}

openapi_python_client/templates/property_templates/union_property.py.jinja

@@ -37,7 +37,7 @@ def _parse_{{ property.python_name }}(data: object) -> {{ property.get_type_stri
 {# 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, query_param=False) %}
+{% macro transform(property, source, destination, declare_type=True, stringify=False, query_param=False) %}
 {% if not property.required or property.nullable %}
 {{ destination }}{% if declare_type %}: {{ property.get_type_string(json=True) }}{% endif %}