openapi-python-client 0.24.2__tar.gz → 0.25.0__tar.gz

{openapi_python_client-0.24.2 → openapi_python_client-0.25.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openapi-python-client
-Version: 0.24.2
+Version: 0.25.0
 Summary: Generate modern Python clients from OpenAPI
 Project-URL: repository, https://github.com/openapi-generators/openapi-python-client
 Author-email: Dylan Anthony <contact@dylananthony.com>
@@ -21,14 +21,14 @@ Classifier: Typing :: Typed
 Requires-Python: <4.0,>=3.9
 Requires-Dist: attrs>=22.2.0
 Requires-Dist: colorama>=0.4.3; sys_platform == 'win32'
-Requires-Dist: httpx<0.29.0,>=0.20.0
+Requires-Dist: httpx<0.29.0,>=0.23.0
 Requires-Dist: jinja2<4.0.0,>=3.0.0
 Requires-Dist: pydantic<3.0.0,>=2.10
 Requires-Dist: python-dateutil<3.0.0,>=2.8.1
 Requires-Dist: ruamel-yaml<0.19.0,>=0.18.6
 Requires-Dist: ruff<0.12,>=0.2
 Requires-Dist: shellingham<2.0.0,>=1.3.2
-Requires-Dist: typer<0.16,>0.6
+Requires-Dist: typer<0.17,>0.6
 Requires-Dist: typing-extensions<5.0.0,>=4.8.0
 Description-Content-Type: text/markdown
 
@@ -226,6 +226,39 @@ content_type_overrides:
   application/zip: application/octet-stream
 ```
 
+## Supported Extensions
+
+### x-enum-varnames
+
+This extension has been adopted by similar projects such as [OpenAPI Tools](https://github.com/OpenAPITools/openapi-generator/pull/917).
+It is intended to provide user-friendly names for integer Enum members that get generated.
+It is critical that the length of the array matches that of the enum values.
+
+```
+"Colors": {
+   "type": "integer",
+   "format": "int32",
+   "enum": [
+       0,
+       1,
+       2
+   ], 
+  "x-enum-varnames": [
+      "Red",
+      "Green",
+      "Blue"
+   ]
+}
+```
+
+Results in:
+```
+class Color(IntEnum):
+    RED = 0
+    GREEN = 1
+    BLUE = 2
+```
+
 [changelog.md]: CHANGELOG.md
 [poetry]: https://python-poetry.org/
 [PDM]: https://pdm-project.org/latest/

{openapi_python_client-0.24.2 → openapi_python_client-0.25.0}/README.md

@@ -192,6 +192,39 @@ content_type_overrides:
   application/zip: application/octet-stream
 ```
 
+## Supported Extensions
+
+### x-enum-varnames
+
+This extension has been adopted by similar projects such as [OpenAPI Tools](https://github.com/OpenAPITools/openapi-generator/pull/917).
+It is intended to provide user-friendly names for integer Enum members that get generated.
+It is critical that the length of the array matches that of the enum values.
+
+```
+"Colors": {
+   "type": "integer",
+   "format": "int32",
+   "enum": [
+       0,
+       1,
+       2
+   ], 
+  "x-enum-varnames": [
+      "Red",
+      "Green",
+      "Blue"
+   ]
+}
+```
+
+Results in:
+```
+class Color(IntEnum):
+    RED = 0
+    GREEN = 1
+    BLUE = 2
+```
+
 [changelog.md]: CHANGELOG.md
 [poetry]: https://python-poetry.org/
 [PDM]: https://pdm-project.org/latest/

{openapi_python_client-0.24.2 → openapi_python_client-0.25.0}/openapi_python_client/parser/properties/const.py

@@ -94,7 +94,6 @@ class ConstProperty(PropertyProtocol):
         no_optional: bool = False,
         json: bool = False,
         *,
-        multipart: bool = False,
         quoted: bool = False,
     ) -> str:
         lit = f"Literal[{self.value.python_code}]"

{openapi_python_client-0.24.2 → openapi_python_client-0.25.0}/openapi_python_client/parser/properties/enum_property.py

@@ -121,7 +121,8 @@ class EnumProperty(PropertyProtocol):
         if parent_name:
             class_name = f"{utils.pascal_case(parent_name)}{utils.pascal_case(class_name)}"
         class_info = Class.from_string(string=class_name, config=config)
-        values = EnumProperty.values_from_list(value_list, class_info)
+        var_names = data.model_extra.get("x-enum-varnames", []) if data.model_extra else []
+        values = EnumProperty.values_from_list(value_list, class_info, var_names)
 
         if class_info.name in schemas.classes_by_name:
             existing = schemas.classes_by_name[class_info.name]
@@ -183,14 +184,21 @@ class EnumProperty(PropertyProtocol):
         return imports
 
     @staticmethod
-    def values_from_list(values: list[str] | list[int], class_info: Class) -> dict[str, ValueType]:
+    def values_from_list(
+        values: list[str] | list[int], class_info: Class, var_names: list[str]
+    ) -> dict[str, ValueType]:
         """Convert a list of values into dict of {name: value}, where value can sometimes be None"""
         output: dict[str, ValueType] = {}
+        use_var_names = len(var_names) == len(values)
 
         for i, value in enumerate(values):
             value = cast(Union[str, int], value)
             if isinstance(value, int):
-                if value < 0:
+                if use_var_names:
+                    key = var_names[i]
+                    sanitized_key = utils.snake_case(key).upper()
+                    output[sanitized_key] = value
+                elif value < 0:
                     output[f"VALUE_NEGATIVE_{-value}"] = value
                 else:
                     output[f"VALUE_{value}"] = value

{openapi_python_client-0.24.2 → openapi_python_client-0.25.0}/openapi_python_client/parser/properties/file.py

@@ -22,7 +22,7 @@ class FileProperty(PropertyProtocol):
 
     _type_string: ClassVar[str] = "File"
     # Return type of File.to_tuple()
-    _json_type_string: ClassVar[str] = "FileJsonType"
+    _json_type_string: ClassVar[str] = "types.FileTypes"
     template: ClassVar[str] = "file_property.py.jinja"
 
     @classmethod
@@ -63,5 +63,5 @@ class FileProperty(PropertyProtocol):
             back to the root of the generated client.
         """
         imports = super().get_imports(prefix=prefix)
-        imports.update({f"from {prefix}types import File, FileJsonType", "from io import BytesIO"})
+        imports.update({f"from {prefix}types import File, FileTypes", "from io import BytesIO"})
         return imports

{openapi_python_client-0.24.2 → openapi_python_client-0.25.0}/openapi_python_client/parser/properties/list_property.py

@@ -138,7 +138,6 @@ class ListProperty(PropertyProtocol):
         no_optional: bool = False,
         json: bool = False,
         *,
-        multipart: bool = False,
         quoted: bool = False,
     ) -> str:
         """
@@ -150,8 +149,6 @@ class ListProperty(PropertyProtocol):
         """
         if json:
             type_string = self.get_base_json_type_string()
-        elif multipart:
-            type_string = "tuple[None, bytes, str]"
         else:
             type_string = self.get_base_type_string()
 

{openapi_python_client-0.24.2 → openapi_python_client-0.25.0}/openapi_python_client/parser/properties/model_property.py

@@ -189,7 +189,6 @@ class ModelProperty(PropertyProtocol):
         no_optional: bool = False,
         json: bool = False,
         *,
-        multipart: bool = False,
         quoted: bool = False,
     ) -> str:
         """
@@ -201,8 +200,6 @@ class ModelProperty(PropertyProtocol):
         """
         if json:
             type_string = self.get_base_json_type_string()
-        elif multipart:
-            type_string = "tuple[None, bytes, str]"
         else:
             type_string = self.get_base_type_string()
 

{openapi_python_client-0.24.2 → openapi_python_client-0.25.0}/openapi_python_client/parser/properties/protocol.py

@@ -101,7 +101,6 @@ class PropertyProtocol(Protocol):
         no_optional: bool = False,
         json: bool = False,
         *,
-        multipart: bool = False,
         quoted: bool = False,
     ) -> str:
         """
@@ -110,13 +109,10 @@ class PropertyProtocol(Protocol):
         Args:
             no_optional: Do not include Optional or Unset even if the value is optional (needed for isinstance checks)
             json: True if the type refers to the property after JSON serialization
-            multipart: True if the type should be used in a multipart request
             quoted: True if the type should be wrapped in quotes (if not a base type)
         """
         if json:
             type_string = self.get_base_json_type_string(quoted=quoted)
-        elif multipart:
-            type_string = "tuple[None, bytes, str]"
         else:
             type_string = self.get_base_type_string(quoted=quoted)
 

{openapi_python_client-0.24.2 → openapi_python_client-0.25.0}/openapi_python_client/parser/properties/union.py

@@ -106,10 +106,9 @@ class UnionProperty(PropertyProtocol):
                 return value_or_error
         return value_or_error
 
-    def _get_inner_type_strings(self, json: bool, multipart: bool) -> set[str]:
+    def _get_inner_type_strings(self, json: bool) -> set[str]:
         return {
-            p.get_type_string(no_optional=True, json=json, multipart=multipart, quoted=not p.is_base_type)
-            for p in self.inner_properties
+            p.get_type_string(no_optional=True, json=json, quoted=not p.is_base_type) for p in self.inner_properties
         }
 
     @staticmethod
@@ -119,12 +118,12 @@ class UnionProperty(PropertyProtocol):
         return f"Union[{', '.join(sorted(inner_types))}]"
 
     def get_base_type_string(self, *, quoted: bool = False) -> str:
-        return self._get_type_string_from_inner_type_strings(self._get_inner_type_strings(json=False, multipart=False))
+        return self._get_type_string_from_inner_type_strings(self._get_inner_type_strings(json=False))
 
     def get_base_json_type_string(self, *, quoted: bool = False) -> str:
-        return self._get_type_string_from_inner_type_strings(self._get_inner_type_strings(json=True, multipart=False))
+        return self._get_type_string_from_inner_type_strings(self._get_inner_type_strings(json=True))
 
-    def get_type_strings_in_union(self, *, no_optional: bool = False, json: bool, multipart: bool) -> set[str]:
+    def get_type_strings_in_union(self, *, no_optional: bool = False, json: bool) -> set[str]:
         """
         Get the set of all the types that should appear within the `Union` representing this property.
 
@@ -133,12 +132,11 @@ class UnionProperty(PropertyProtocol):
         Args:
             no_optional: Do not include `None` or `Unset` in this set.
             json: If True, this returns the JSON types, not the Python types, of this property.
-            multipart: If True, this returns the multipart types, not the Python types, of this property.
 
         Returns:
             A set of strings containing the types that should appear within `Union`.
         """
-        type_strings = self._get_inner_type_strings(json=json, multipart=multipart)
+        type_strings = self._get_inner_type_strings(json=json)
         if no_optional:
             return type_strings
         if not self.required:
@@ -150,7 +148,6 @@ class UnionProperty(PropertyProtocol):
         no_optional: bool = False,
         json: bool = False,
         *,
-        multipart: bool = False,
         quoted: bool = False,
     ) -> str:
         """
@@ -158,7 +155,7 @@ class UnionProperty(PropertyProtocol):
         This implementation differs slightly from `Property.get_type_string` in order to collapse
         nested union types.
         """
-        type_strings_in_union = self.get_type_strings_in_union(no_optional=no_optional, json=json, multipart=multipart)
+        type_strings_in_union = self.get_type_strings_in_union(no_optional=no_optional, json=json)
         return self._get_type_string_from_inner_type_strings(type_strings_in_union)
 
     def get_imports(self, *, prefix: str) -> set[str]:

{openapi_python_client-0.24.2 → openapi_python_client-0.25.0}/openapi_python_client/templates/endpoint_macros.py.jinja

@@ -58,33 +58,33 @@ params = {k: v for k, v in params.items() if v is not UNSET and v is not None}
 {% endif %}
 {% endmacro %}
 
-{% macro body_to_kwarg(body, destination) %}
+{% macro body_to_kwarg(body) %}
 {% if body.body_type == "data" %}
-{{ destination }} = body.to_dict()
+_kwargs["data"] = body.to_dict()
 {% elif body.body_type == "files"%}
-{{ multipart_body(body, destination) }}
+{{ multipart_body(body) }}
 {% elif body.body_type == "json" %}
-{{ json_body(body, destination) }}
+{{ json_body(body) }}
 {% elif body.body_type == "content" %}
-{{ destination }} = body.payload
+_kwargs["content"] = body.payload
 {% endif %}
 {% endmacro %}
 
-{% macro json_body(body, destination) %}
+{% macro json_body(body) %}
 {% set property = body.prop %}
 {% import "property_templates/" + property.template as prop_template %}
 {% if prop_template.transform %}
-{{ prop_template.transform(property, property.python_name, destination) }}
+{{ prop_template.transform(property, property.python_name, "_kwargs[\"json\"]") }}
 {% else %}
-{{ destination }} = {{ property.python_name }}
+_kwargs["json"] = {{ property.python_name }}
 {% endif %}
 {% endmacro %}
 
-{% macro multipart_body(body, destination) %}
+{% macro multipart_body(body) %}
 {% set property = body.prop %}
 {% import "property_templates/" + property.template as prop_template %}
 {% if prop_template.transform_multipart_body %}
-{{ prop_template.transform_multipart_body(property, property.python_name, destination) }}
+{{ prop_template.transform_multipart_body(property) }}
 {% endif %}
 {% endmacro %}
 

{openapi_python_client-0.24.2 → openapi_python_client-0.25.0}/openapi_python_client/templates/endpoint_module.py.jinja

@@ -48,15 +48,12 @@ def _get_kwargs(
 {% if endpoint.bodies | length > 1 %}
 {% for body in endpoint.bodies %}
     if isinstance(body, {{body.prop.get_type_string() }}):
-        {% set destination = "_" + body.body_type + "_body" %}
-        {{ body_to_kwarg(body, destination) | indent(8) }}
-        _kwargs["{{ body.body_type.value }}"] = {{ destination }}
+        {{ body_to_kwarg(body) | indent(8) }}
         headers["Content-Type"] = "{{ body.content_type }}"
 {% endfor %}
 {% elif endpoint.bodies | length == 1 %}
 {% set body = endpoint.bodies[0] %}
-    {{ body_to_kwarg(body, "_body") | indent(4) }}
-    _kwargs["{{ body.body_type.value }}"] = _body
+    {{ body_to_kwarg(body) | indent(4) }}
     {% if body.content_type != "multipart/form-data" %}{# Need httpx to set the boundary automatically #}
     headers["Content-Type"] = "{{ body.content_type }}"
     {% endif %}

{openapi_python_client-0.24.2 → openapi_python_client-0.25.0}/openapi_python_client/templates/model.py.jinja

@@ -1,10 +1,11 @@
 from collections.abc import Mapping
-from typing import Any, TypeVar, Optional, BinaryIO, TextIO, TYPE_CHECKING
+from typing import Any, TypeVar, Optional, BinaryIO, TextIO, TYPE_CHECKING, Generator
 
 from attrs import define as _attrs_define
 from attrs import field as _attrs_field
 {% if model.is_multipart_body %}
 import json
+from .. import types
 {% endif %}
 
 from ..types import UNSET, Unset
@@ -82,32 +83,45 @@ class {{ class_name }}:
     additional_properties: dict[str, {{ additional_property_type }}] = _attrs_field(init=False, factory=dict)
     {% endif %}
 
-{% macro _to_dict(multipart=False) %}
-{% for property in model.required_properties + model.optional_properties %}
+{% macro _transform_property(property, content) %}
 {% import "property_templates/" + property.template as prop_template %}
-{% if multipart %}
-{{ prop_template.transform_multipart(property, "self." + property.python_name, property.python_name) }}
-{% elif prop_template.transform %}
-{{ prop_template.transform(property=property, source="self." + property.python_name, destination=property.python_name) }}
+{%- if prop_template.transform -%}
+{{ prop_template.transform(property=property, source=content, destination=property.python_name) }}
+{%- else -%}
+{{ property.python_name }} = {{ content }}
+{%- endif -%}
+{% endmacro %}
+
+{% macro multipart(property, source, destination) %}
+{% import "property_templates/" + property.template as prop_template %}
+{% if not property.required %}
+if not isinstance({{source}}, Unset):
+    {{ prop_template.multipart(property, source, destination) | indent(4) }}
 {% else %}
-{{ property.python_name }} = self.{{ property.python_name }}
+{{ prop_template.multipart(property, source, destination) }}
 {% endif %}
+{% endmacro %}
 
-{% endfor %}
-
+{% macro _prepare_field_dict() %}
 field_dict: dict[str, Any] = {}
 {% if model.additional_properties %}
 {% import "property_templates/" + model.additional_properties.template as prop_template %}
-{% if multipart %}
-for prop_name, prop in self.additional_properties.items():
-    {{ prop_template.transform_multipart(model.additional_properties, "prop", "field_dict[prop_name]") | indent(4) }}
-{% elif prop_template.transform %}
+{% if prop_template.transform %}
 for prop_name, prop in self.additional_properties.items():
     {{ prop_template.transform(model.additional_properties, "prop", "field_dict[prop_name]", declare_type=false) | indent(4) }}
 {% else %}
 field_dict.update(self.additional_properties)
-{% endif %}
-{% endif %}
+{%- endif -%}
+{%- endif -%}
+{% endmacro %}
+
+{% macro _to_dict() %}
+{% for property in model.required_properties + model.optional_properties -%}
+{{ _transform_property(property, "self." + property.python_name) }}
+
+{% endfor %}
+
+{{ _prepare_field_dict() }}
 {% if model.required_properties | length > 0 or model.optional_properties | length > 0 %}
 field_dict.update({
     {% for property in model.required_properties + model.optional_properties %}
@@ -134,8 +148,22 @@ return field_dict
         {{ _to_dict() | indent(8) }}
 
 {% if model.is_multipart_body %}
-    def to_multipart(self) -> dict[str, Any]:
-        {{ _to_dict(multipart=True) | indent(8) }}
+    def to_multipart(self) -> types.RequestFiles:
+        files: types.RequestFiles = []
+
+        {% for property in model.required_properties + model.optional_properties %}
+        {% set destination = "\"" + property.name + "\"" %}
+        {{ multipart(property, "self." + property.python_name, destination) | indent(8) }}
+
+        {% endfor %}
+
+        {% if model.additional_properties %}
+        for prop_name, prop in self.additional_properties.items():
+            {{ multipart(model.additional_properties, "prop", "prop_name") | indent(4) }}
+        {% endif %}
+
+        return files
+
 {% endif %}
 
     @classmethod

openapi_python_client-0.25.0/openapi_python_client/templates/property_templates/any_property.py.jinja

@@ -0,0 +1,3 @@
+{% macro multipart(property, source, name) %}
+files.append(({{ name }}, (None, str({{source}}).encode(), "text/plain")))
+{% endmacro %}

openapi_python_client-0.25.0/openapi_python_client/templates/property_templates/boolean_property.py.jinja

@@ -0,0 +1,7 @@
+{% macro transform_header(source) %}
+"true" if {{ source }} else "false"
+{% endmacro %}
+
+{% macro multipart(property, source, name) %}
+files.append(({{ name }}, (None, str({{source}}).encode(), "text/plain")))
+{% endmacro %}

{openapi_python_client-0.24.2 → openapi_python_client-0.25.0}/openapi_python_client/templates/property_templates/const_property.py.jinja

@@ -3,3 +3,7 @@
 if {{ property.python_name }} != {{ property.value.python_code }}{% if not property.required %}and not isinstance({{ property.python_name }}, Unset){% endif %}:
     raise ValueError(f"{{ property.name }} must match const {{ property.value.python_code }}, got '{{'{' + property.python_name + '}' }}'")
 {%- endmacro %}
+
+{% macro multipart(property, source, name) %}
+files.append(({{ name }}, (None, {{ source }}, "text/plain")))
+{% endmacro %}

{openapi_python_client-0.24.2 → openapi_python_client-0.25.0}/openapi_python_client/templates/property_templates/date_property.py.jinja

@@ -26,14 +26,6 @@ if not isinstance({{ source }}, Unset):
 {%- endif %}
 {% endmacro %}
 
-{% macro transform_multipart(property, source, destination) %}
-{% set transformed = source + ".isoformat().encode()" %}
-{% if property.required %}
-{{ destination }} = {{ transformed }}
-{%- else %}
-{% set type_annotation = property.get_type_string(json=True) | replace("str", "bytes") %}
-{{ destination }}: {{ type_annotation }} = UNSET
-if not isinstance({{ source }}, Unset):
-    {{ destination }} = {{ transformed }}
-{%- endif %}
+{% macro multipart(property, source, name) %}
+files.append(({{ name }}, (None, {{ source }}.isoformat().encode(), "text/plain")))
 {% endmacro %}

{openapi_python_client-0.24.2 → openapi_python_client-0.25.0}/openapi_python_client/templates/property_templates/datetime_property.py.jinja

@@ -26,14 +26,6 @@ if not isinstance({{ source }}, Unset):
 {%- endif %}
 {% endmacro %}
 
-{% macro transform_multipart(property, source, destination) %}
-{% set transformed = source + ".isoformat().encode()" %}
-{% if property.required %}
-{{ destination }} = {{ transformed }}
-{%- else %}
-{% set type_annotation = property.get_type_string(json=True) | replace("str", "bytes") %}
-{{ destination }}: {{ type_annotation }} = UNSET
-if not isinstance({{ source }}, Unset):
-    {{ destination }} = {{ transformed }}
-{%- endif %}
+{% macro multipart(property, source, name) %}
+files.append(({{ name }}, (None, {{ source }}.isoformat().encode(), "text/plain")))
 {% endmacro %}

{openapi_python_client-0.24.2 → openapi_python_client-0.25.0}/openapi_python_client/templates/property_templates/enum_property.py.jinja

@@ -10,7 +10,7 @@
 
 {% macro check_type_for_construct(property, source) %}isinstance({{ source }}, {{ property.value_type.__name__ }}){% endmacro %}
 
-{% macro transform(property, source, destination, declare_type=True, multipart=False) %}
+{% macro transform(property, source, destination, declare_type=True) %}
 {% set transformed = source + ".value" %}
 {% set type_string = property.get_type_string(json=True) %}
 {% if property.required %}
@@ -22,16 +22,8 @@ if not isinstance({{ source }}, Unset):
 {% endif %}
 {% endmacro %}
 
-{% macro transform_multipart(property, source, destination) %}
-{% set transformed = "(None, str(" + source + ".value" + ").encode(), \"text/plain\")" %}
-{% set type_string = "Union[Unset, tuple[None, bytes, str]]" %}
-{% if property.required %}
-{{ destination }} = {{ transformed }}
-{%- else %}
-{{ destination }}: {{ type_string }} = UNSET
-if not isinstance({{ source }}, Unset):
-    {{ destination }} = {{ transformed }}
-{% endif %}
+{% macro multipart(property, source, name) %}
+files.append(({{ name }},  (None, str({{ source }}.value).encode(), "text/plain")))
 {% endmacro %}
 
 {% macro transform_header(source) %}

{openapi_python_client-0.24.2 → openapi_python_client-0.25.0}/openapi_python_client/templates/property_templates/file_property.py.jinja

@@ -22,12 +22,6 @@ if not isinstance({{ source }}, Unset):
 {% endif %}
 {% endmacro %}
 
-{% macro transform_multipart(property, source, destination) %}
-{% if property.required %}
-{{ destination }} = {{ source }}.to_tuple()
-{% else %}
-{{ destination }}: {{ property.get_type_string(json=True) }} = UNSET
-if not isinstance({{ source }}, Unset):
-    {{ destination }} = {{ source }}.to_tuple()
-{% endif %}
+{% macro multipart(property, source, name) %}
+files.append(({{ name }}, {{ source }}.to_tuple()))
 {% endmacro %}

openapi_python_client-0.25.0/openapi_python_client/templates/property_templates/float_property.py.jinja

@@ -0,0 +1,7 @@
+{% macro transform_header(source) %}
+str({{ source }})
+{% endmacro %}
+
+{% macro multipart(property, source, name) %}
+files.append(({{ name }}, (None, str({{source}}).encode(), "text/plain")))
+{% endmacro %}

openapi_python_client-0.25.0/openapi_python_client/templates/property_templates/int_property.py.jinja

@@ -0,0 +1,7 @@
+{% macro transform_header(source) %}
+str({{ source }})
+{% endmacro %}
+
+{% macro multipart(property, source, name) %}
+files.append(({{ name }}, (None, str({{source}}).encode(), "text/plain")))
+{% endmacro %}

{openapi_python_client-0.24.2 → openapi_python_client-0.25.0}/openapi_python_client/templates/property_templates/list_property.py.jinja

@@ -17,12 +17,8 @@ for {{ inner_source }} in (_{{ property.python_name }} or []):
 {% endif %}
 {% endmacro %}
 
-{% macro _transform(property, source, destination, multipart, transform_method) %}
+{% macro _transform(property, source, destination, transform_method) %}
 {% set inner_property = property.inner_property %}
-{% if multipart %}
-{% set multipart_destination = destination %}
-{% set destination = "_temp_" + destination %}
-{% endif %}
 {% import "property_templates/" + inner_property.template as inner_template %}
 {% if inner_template.transform %}
 {% set inner_source = inner_property.python_name + "_data" %}
@@ -33,9 +29,6 @@ for {{ inner_source }} in {{ source }}:
 {% else %}
 {{ destination }} = {{ source }}
 {% endif %}
-{% if multipart %}
-{{ multipart_destination }} = (None, json.dumps({{ destination }}).encode(), 'application/json')
-{% endif %}
 {% endmacro %}
 
 {% macro check_type_for_construct(property, source) %}isinstance({{ source }}, list){% endmacro %}
@@ -44,34 +37,18 @@ for {{ inner_source }} in {{ source }}:
 {% set inner_property = property.inner_property %}
 {% set type_string = property.get_type_string(json=True) %}
 {% if property.required %}
-{{ _transform(property, source, destination, False, "to_dict") }}
+{{ _transform(property, source, destination, "to_dict") }}
 {% else %}
 {{ destination }}{% if declare_type %}: {{ type_string }}{% endif %} = UNSET
 if not isinstance({{ source }}, Unset):
-    {{ _transform(property, source, destination, False, "to_dict") | indent(4)}}
-{% endif %}
-{% endmacro %}
-
-{% macro transform_multipart(property, source, destination) %}
-{% set inner_property = property.inner_property %}
-{% set type_string = "Union[Unset, tuple[None, bytes, str]]" %}
-{% if property.required %}
-{{ _transform(property, source, destination, True, "to_dict") }}
-{% else %}
-{{ destination }}: {{ type_string }} = UNSET
-if not isinstance({{ source }}, Unset):
-    {{ _transform(property, source, destination, True, "to_dict") | indent(4)}}
+    {{ _transform(property, source, destination, "to_dict") | indent(4)}}
 {% endif %}
 {% endmacro %}
 
-{% macro transform_multipart_body(property, source, destination) %}
+{% macro multipart(property, source, destination) %}
 {% set inner_property = property.inner_property %}
-{% set type_string = property.get_type_string(json=True) %}
-{% if property.required %}
-{{ _transform(property, source, destination, False, "to_multipart") }}
-{% else %}
-{{ destination }}: {{ type_string }} = UNSET
-if not isinstance({{ source }}, Unset):
-    {{ _transform(property, source, destination, False, "to_multipart") | indent(4)}}
-{% endif %}
+{% import "property_templates/" + inner_property.template as inner_template %}
+{% set inner_source = inner_property.python_name + "_element" %}
+for {{ inner_source }} in {{ source }}:
+    {{ inner_template.multipart(inner_property, inner_source, destination) | indent(4) }}
 {% endmacro %}