fix: support multiple files for multipart arrays

Author: micha91

openapi_python_client/templates/model.py.jinja

@@ -77,26 +77,26 @@ 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, multipart=False) %}
 {% import "property_templates/" + property.template as prop_template %}
-{% if prop_template.transform %}
-{{ prop_template.transform(property, "self." + property.python_name, property.python_name, multipart=multipart) }}
-{% elif multipart %}
-{{ property.python_name }} = self.{{ property.python_name }} if isinstance(self.{{ property.python_name }}, Unset) else (None, str(self.{{ property.python_name }}).encode(), "text/plain")
-{% else %}
-{{ property.python_name }} = self.{{ property.python_name }}
-{% endif %}
+{%- if prop_template.transform -%}
+{{ prop_template.transform(property, content, property.python_name, multipart=multipart) }}
+{%- elif multipart -%}
+{{ property.python_name }} = {{ content }} if isinstance({{ content }}, Unset) else (None, str({{ content }}).encode(), "text/plain")
+{%- else -%}
+{{ property.python_name }} = {{ content }}
+{%- endif -%}
 
-{% endfor %}
+{%- endmacro -%}
 
+{% macro _prepare_field_dict(multipart=False) %}
 field_dict: Dict[str, Any] = {}
 {% if model.additional_properties %}
-{% if model.additional_properties.template %}{# Can be a bool instead of an object #}
-    {% import "property_templates/" + model.additional_properties.template as prop_template %}
-{% else %}
-    {% set prop_template = None %}
-{% endif %}
+{%- if model.additional_properties.template -%}{# Can be a bool instead of an object #}
+    {%- import "property_templates/" + model.additional_properties.template as prop_template -%}
+{%- else -%}
+    {%- set prop_template = None -%}
+{%- endif -%}
 {% if prop_template and prop_template.transform %}
 for prop_name, prop in self.additional_properties.items():
     {{ prop_template.transform(model.additional_properties, "prop", "field_dict[prop_name]", multipart=multipart, declare_type=false) | indent(4) }}
@@ -107,8 +107,16 @@ field_dict.update({
 })
 {% 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() }}
 field_dict.update({
     {% for property in model.required_properties + model.optional_properties %}
     {% if property.required %}
@@ -133,8 +141,35 @@ 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) -> List[Tuple[str, Any]]:
+        field_list: List[Tuple[str, Any]] = []
+        {% for property in model.required_properties + model.optional_properties %}
+        {% if property.__class__.__name__ == 'ListProperty' %}
+        {% if not property.required %}
+        for cont in self.{{ property.python_name }} or []:
+        {% else %}
+        for cont in self.{{ property.python_name }}:
+        {% endif %}
+            {{ _transform_property(property.inner_property, "cont", True) | indent(12) }}
+            field_list.append(("{{ property.python_name }}", {{property.inner_property.python_name}}))
+
+        {% else %}
+        {{ _transform_property(property, "self." + property.python_name, True) | indent(8) }}
+        {% if not property.required %}
+        if {{ property.python_name }} is not UNSET:
+            field_list.append(("{{ property.python_name }}", {{property.python_name}}))
+        {% else %}
+        field_list.append(("{{ property.python_name }}", {{property.python_name}}))
+        {% endif %}
+        {% endif %}
+        {% endfor %}
+
+        {{ _prepare_field_dict(True) | indent(8) }}
+
+        field_list += list(field_dict.items())
+
+        return field_list
+
 {% endif %}
 
     @classmethod