fix: Non-string multipart fields must be stringified

Author: Constantinos Symeonides

end_to_end_tests/golden_record/my_test_api_client/api/tests/upload_file_tests_upload_post.py

@@ -1,3 +1,4 @@
+import json
 from typing import Any, Dict, Optional, Union
 
 import httpx
@@ -27,8 +28,10 @@ def _get_kwargs(
     for key, value in multipart_data.to_dict().items():
         if is_file(value):
             files[key] = value
-        else:
+        elif isinstance(value, str):
             data[key] = value
+        else:
+            data[key] = json.dumps(value)
 
     return {
         "url": url,

end_to_end_tests/golden_record/my_test_api_client/models/__init__.py

@@ -6,6 +6,7 @@
 from .an_int_enum import AnIntEnum
 from .another_all_of_sub_model import AnotherAllOfSubModel
 from .body_upload_file_tests_upload_post import BodyUploadFileTestsUploadPost
+from .body_upload_file_tests_upload_post_some_object import BodyUploadFileTestsUploadPostSomeObject
 from .different_enum import DifferentEnum
 from .free_form_model import FreeFormModel
 from .http_validation_error import HTTPValidationError

end_to_end_tests/golden_record/my_test_api_client/models/body_upload_file_tests_upload_post.py

@@ -1,8 +1,9 @@
 from io import BytesIO
-from typing import Any, Dict, Type, TypeVar, Union
+from typing import Any, Dict, List, Type, TypeVar, Union, cast
 
 import attr
 
+from ..models.body_upload_file_tests_upload_post_some_object import BodyUploadFileTestsUploadPostSomeObject
 from ..types import UNSET, File, FileJsonType, Unset
 
 T = TypeVar("T", bound="BodyUploadFileTestsUploadPost")
@@ -15,6 +16,9 @@ class BodyUploadFileTestsUploadPost:
     some_file: File
     some_optional_file: Union[Unset, File] = UNSET
     some_string: Union[Unset, str] = "some_default_string"
+    some_number: Union[Unset, float] = UNSET
+    some_array: Union[Unset, List[float]] = UNSET
+    some_object: Union[Unset, BodyUploadFileTestsUploadPostSomeObject] = UNSET
 
     def to_dict(self) -> Dict[str, Any]:
         some_file = self.some_file.to_tuple()
@@ -24,6 +28,14 @@ def to_dict(self) -> Dict[str, Any]:
             some_optional_file = self.some_optional_file.to_tuple()
 
         some_string = self.some_string
+        some_number = self.some_number
+        some_array: Union[Unset, List[float]] = UNSET
+        if not isinstance(self.some_array, Unset):
+            some_array = self.some_array
+
+        some_object: Union[Unset, Dict[str, Any]] = UNSET
+        if not isinstance(self.some_object, Unset):
+            some_object = self.some_object.to_dict()
 
         field_dict: Dict[str, Any] = {}
         field_dict.update(
@@ -35,6 +47,12 @@ def to_dict(self) -> Dict[str, Any]:
             field_dict["some_optional_file"] = some_optional_file
         if some_string is not UNSET:
             field_dict["some_string"] = some_string
+        if some_number is not UNSET:
+            field_dict["some_number"] = some_number
+        if some_array is not UNSET:
+            field_dict["some_array"] = some_array
+        if some_object is not UNSET:
+            field_dict["some_object"] = some_object
 
         return field_dict
 
@@ -50,10 +68,22 @@ def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
 
         some_string = d.pop("some_string", UNSET)
 
+        some_number = d.pop("some_number", UNSET)
+
+        some_array = cast(List[float], d.pop("some_array", UNSET))
+
+        some_object: Union[Unset, BodyUploadFileTestsUploadPostSomeObject] = UNSET
+        _some_object = d.pop("some_object", UNSET)
+        if not isinstance(_some_object, Unset):
+            some_object = BodyUploadFileTestsUploadPostSomeObject.from_dict(_some_object)
+
         body_upload_file_tests_upload_post = cls(
             some_file=some_file,
             some_optional_file=some_optional_file,
             some_string=some_string,
+            some_number=some_number,
+            some_array=some_array,
+            some_object=some_object,
         )
 
         return body_upload_file_tests_upload_post

end_to_end_tests/golden_record/my_test_api_client/models/body_upload_file_tests_upload_post_some_object.py

@@ -0,0 +1,60 @@
+from typing import Any, Dict, List, Type, TypeVar
+
+import attr
+
+T = TypeVar("T", bound="BodyUploadFileTestsUploadPostSomeObject")
+
+
+@attr.s(auto_attribs=True)
+class BodyUploadFileTestsUploadPostSomeObject:
+    """  """
+
+    num: float
+    text: str
+    additional_properties: Dict[str, Any] = attr.ib(init=False, factory=dict)
+
+    def to_dict(self) -> Dict[str, Any]:
+        num = self.num
+        text = self.text
+
+        field_dict: Dict[str, Any] = {}
+        field_dict.update(self.additional_properties)
+        field_dict.update(
+            {
+                "num": num,
+                "text": text,
+            }
+        )
+
+        return field_dict
+
+    @classmethod
+    def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
+        d = src_dict.copy()
+        num = d.pop("num")
+
+        text = d.pop("text")
+
+        body_upload_file_tests_upload_post_some_object = cls(
+            num=num,
+            text=text,
+        )
+
+        body_upload_file_tests_upload_post_some_object.additional_properties = d
+        return body_upload_file_tests_upload_post_some_object
+
+    @property
+    def additional_keys(self) -> List[str]:
+        return list(self.additional_properties.keys())
+
+    def __getitem__(self, key: str) -> Any:
+        return self.additional_properties[key]
+
+    def __setitem__(self, key: str, value: Any) -> None:
+        self.additional_properties[key] = value
+
+    def __delitem__(self, key: str) -> None:
+        del self.additional_properties[key]
+
+    def __contains__(self, key: str) -> bool:
+        return key in self.additional_properties

end_to_end_tests/openapi.json

@@ -943,6 +943,30 @@
             "title": "Some String",
             "type": "string",
             "default": "some_default_string"
+          },
+          "some_number": {
+            "title": "Some Number",
+            "type": "number"
+          },
+          "some_array": {
+            "title": "Some Array",
+            "type": "array",
+            "items": {
+              "type": "number"
+            }
+          },
+          "some_object": {
+            "title": "Some Object",
+            "type": "object",
+            "required": ["num", "text"],
+            "properties": {
+              "num": {
+                "type": "number"
+              },
+              "text": {
+                "type": "string"
+              }
+            }
           }
         },
         "additionalProperties": false

end_to_end_tests/test_end_to_end.py

@@ -86,12 +86,21 @@ def test_file_upload(mocker):
     # Arrange
     from io import StringIO
 
-    from end_to_end_tests.golden_record.my_test_api_client.models import BodyUploadFileTestsUploadPost
+    from end_to_end_tests.golden_record.my_test_api_client.models import (
+        BodyUploadFileTestsUploadPost,
+        BodyUploadFileTestsUploadPostSomeObject,
+    )
     from end_to_end_tests.golden_record.my_test_api_client.types import File
 
     payload = StringIO("my payload")
     file = File(payload=payload, file_name="my_file_name", mime_type="foo/bar")
-    multipart_data = BodyUploadFileTestsUploadPost(some_file=file, some_string="my_string")
+    multipart_data = BodyUploadFileTestsUploadPost(
+        some_file=file,
+        some_string="my_string",
+        some_number=123,
+        some_array=[1, 4, 9],
+        some_object=BodyUploadFileTestsUploadPostSomeObject(num=999, text="foo"),
+    )
 
     base_url = "http://my.base.url"
     client = mocker.MagicMock(base_url=base_url)
@@ -109,5 +118,10 @@ def test_file_upload(mocker):
         cookies=ANY,
         timeout=ANY,
         files={"some_file": ("my_file_name", payload, "foo/bar")},
-        data={"some_string": "my_string"},
+        data={
+            "some_string": "my_string",
+            "some_number": "123",
+            "some_array": "[1, 4, 9]",
+            "some_object": '{"num": 999, "text": "foo"}',
+        },
     )

openapi_python_client/templates/endpoint_module.py.jinja

@@ -1,6 +1,10 @@
 from typing import Any, Dict, List, Optional, Union, cast
 
 import httpx
+{% if endpoint.multipart_body_class %}
+import json
+{% endif %}
+
 from attr import asdict
 
 from ...client import AuthenticatedClient, Client
@@ -42,8 +46,10 @@ def _get_kwargs(
     for key, value in multipart_data.to_dict().items():
          if is_file(value):
              files[key] = value
-         else:
+         elif isinstance(value, str):
              data[key] = value
+         else:
+             data[key] = json.dumps(value)
     {% endif %}
 
     return {