Add array of scalar and JSON objects to multipart integration tests

Author: dbanty

.github/workflows/checks.yml

@@ -158,7 +158,7 @@ jobs:
           - "pdm.minimal.lock"
     services:
       openapi-test-server:
-        image: ghcr.io/openapi-generators/openapi-test-server:0.2.0
+        image: ghcr.io/openapi-generators/openapi-test-server:0.2.1
         ports:
           - "3000:3000"
     steps:

end_to_end_tests/test_end_to_end.py

@@ -266,7 +266,7 @@ def test_generate_dir_already_exists():
 
 
 def test_update_integration_tests():
-    url = "https://raw.githubusercontent.com/openapi-generators/openapi-test-server/refs/tags/v0.2.0/openapi.yaml"
+    url = "https://raw.githubusercontent.com/openapi-generators/openapi-test-server/refs/tags/v0.2.1/openapi.yaml"
     source_path = Path(__file__).parent.parent / "integration-tests"
     temp_dir = Path.cwd() / "test_update_integration_tests"
     shutil.rmtree(temp_dir, ignore_errors=True)

integration-tests/integration_tests/models/__init__.py

@@ -1,16 +1,18 @@
 """Contains all the data models used in inputs/outputs"""
 
+from .an_object import AnObject
+from .file import File
 from .post_body_multipart_body import PostBodyMultipartBody
 from .post_body_multipart_response_200 import PostBodyMultipartResponse200
-from .post_body_multipart_response_200_files_item import PostBodyMultipartResponse200FilesItem
 from .post_parameters_header_response_200 import PostParametersHeaderResponse200
 from .problem import Problem
 from .public_error import PublicError
 
 __all__ = (
+    "AnObject",
+    "File",
     "PostBodyMultipartBody",
     "PostBodyMultipartResponse200",
-    "PostBodyMultipartResponse200FilesItem",
     "PostParametersHeaderResponse200",
     "Problem",
     "PublicError",

integration-tests/integration_tests/models/an_object.py

@@ -0,0 +1,67 @@
+from collections.abc import Mapping
+from typing import Any, TypeVar
+
+from attrs import define as _attrs_define
+from attrs import field as _attrs_field
+
+T = TypeVar("T", bound="AnObject")
+
+
+@_attrs_define
+class AnObject:
+    """
+    Attributes:
+        an_int (int):
+        a_float (float):
+    """
+
+    an_int: int
+    a_float: float
+    additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
+
+    def to_dict(self) -> dict[str, Any]:
+        an_int = self.an_int
+
+        a_float = self.a_float
+
+        field_dict: dict[str, Any] = {}
+        field_dict.update(self.additional_properties)
+        field_dict.update(
+            {
+                "an_int": an_int,
+                "a_float": a_float,
+            }
+        )
+
+        return field_dict
+
+    @classmethod
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
+        d = dict(src_dict)
+        an_int = d.pop("an_int")
+
+        a_float = d.pop("a_float")
+
+        an_object = cls(
+            an_int=an_int,
+            a_float=a_float,
+        )
+
+        an_object.additional_properties = d
+        return an_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

…ody_multipart_response_200_files_item.py …n-tests/integration_tests/models/file.pyintegration-tests/integration_tests/models/post_body_multipart_response_200_files_item.py renamed to integration-tests/integration_tests/models/file.py integration-tests/integration_tests/models/post_body_multipart_response_200_files_item.py renamed to integration-tests/integration_tests/models/file.py

@@ -6,11 +6,11 @@
 
 from ..types import UNSET, Unset
 
-T = TypeVar("T", bound="PostBodyMultipartResponse200FilesItem")
+T = TypeVar("T", bound="File")
 
 
 @_attrs_define
-class PostBodyMultipartResponse200FilesItem:
+class File:
     """
     Attributes:
         data (Union[Unset, str]): Echo of content of the 'file' input parameter from the form.
@@ -51,14 +51,14 @@ def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
 
         content_type = d.pop("content_type", UNSET)
 
-        post_body_multipart_response_200_files_item = cls(
+        file = cls(
             data=data,
             name=name,
             content_type=content_type,
         )
 
-        post_body_multipart_response_200_files_item.additional_properties = d
-        return post_body_multipart_response_200_files_item
+        file.additional_properties = d
+        return file
 
     @property
     def additional_keys(self) -> list[str]:

integration-tests/integration_tests/models/post_body_multipart_body.py

@@ -1,13 +1,20 @@
+import datetime
+import json
 from collections.abc import Mapping
 from io import BytesIO
-from typing import Any, TypeVar
+from typing import TYPE_CHECKING, Any, TypeVar
 
 from attrs import define as _attrs_define
 from attrs import field as _attrs_field
+from dateutil.parser import isoparse
 
 from .. import types
 from ..types import File
 
+if TYPE_CHECKING:
+    from ..models.an_object import AnObject
+
+
 T = TypeVar("T", bound="PostBodyMultipartBody")
 
 
@@ -18,11 +25,15 @@ class PostBodyMultipartBody:
         a_string (str):
         files (list[File]):
         description (str):
+        objects (list['AnObject']):
+        times (list[datetime.datetime]):
     """
 
     a_string: str
     files: list[File]
     description: str
+    objects: list["AnObject"]
+    times: list[datetime.datetime]
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
@@ -36,13 +47,25 @@ def to_dict(self) -> dict[str, Any]:
 
         description = self.description
 
+        objects = []
+        for objects_item_data in self.objects:
+            objects_item = objects_item_data.to_dict()
+            objects.append(objects_item)
+
+        times = []
+        for times_item_data in self.times:
+            times_item = times_item_data.isoformat()
+            times.append(times_item)
+
         field_dict: dict[str, Any] = {}
         field_dict.update(self.additional_properties)
         field_dict.update(
             {
                 "a_string": a_string,
                 "files": files,
                 "description": description,
+                "objects": objects,
+                "times": times,
             }
         )
 
@@ -58,13 +81,21 @@ def to_multipart(self) -> types.RequestFiles:
 
         files.append(("description", (None, str(self.description).encode(), "text/plain")))
 
+        for objects_item_element in self.objects:
+            files.append(("objects", (None, json.dumps(objects_item_element.to_dict()).encode(), "application/json")))
+
+        for times_item_element in self.times:
+            files.append(("times", (None, times_item_element.isoformat().encode(), "text/plain")))
+
         for prop_name, prop in self.additional_properties.items():
             files.append((prop_name, (None, str(prop).encode(), "text/plain")))
 
         return files
 
     @classmethod
     def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
+        from ..models.an_object import AnObject
+
         d = dict(src_dict)
         a_string = d.pop("a_string")
 
@@ -77,10 +108,26 @@ def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
 
         description = d.pop("description")
 
+        objects = []
+        _objects = d.pop("objects")
+        for objects_item_data in _objects:
+            objects_item = AnObject.from_dict(objects_item_data)
+
+            objects.append(objects_item)
+
+        times = []
+        _times = d.pop("times")
+        for times_item_data in _times:
+            times_item = isoparse(times_item_data)
+
+            times.append(times_item)
+
         post_body_multipart_body = cls(
             a_string=a_string,
             files=files,
             description=description,
+            objects=objects,
+            times=times,
         )
 
         post_body_multipart_body.additional_properties = d

integration-tests/integration_tests/models/post_body_multipart_response_200.py

@@ -1,11 +1,14 @@
+import datetime
 from collections.abc import Mapping
 from typing import TYPE_CHECKING, Any, TypeVar
 
 from attrs import define as _attrs_define
 from attrs import field as _attrs_field
+from dateutil.parser import isoparse
 
 if TYPE_CHECKING:
-    from ..models.post_body_multipart_response_200_files_item import PostBodyMultipartResponse200FilesItem
+    from ..models.an_object import AnObject
+    from ..models.file import File
 
 
 T = TypeVar("T", bound="PostBodyMultipartResponse200")
@@ -17,12 +20,16 @@ class PostBodyMultipartResponse200:
     Attributes:
         a_string (str): Echo of the 'a_string' input parameter from the form.
         description (str): Echo of the 'description' input parameter from the form.
-        files (list['PostBodyMultipartResponse200FilesItem']):
+        files (list['File']):
+        times (list[datetime.datetime]):
+        objects (list['AnObject']):
     """
 
     a_string: str
     description: str
-    files: list["PostBodyMultipartResponse200FilesItem"]
+    files: list["File"]
+    times: list[datetime.datetime]
+    objects: list["AnObject"]
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
@@ -35,21 +42,34 @@ def to_dict(self) -> dict[str, Any]:
             files_item = files_item_data.to_dict()
             files.append(files_item)
 
+        times = []
+        for times_item_data in self.times:
+            times_item = times_item_data.isoformat()
+            times.append(times_item)
+
+        objects = []
+        for objects_item_data in self.objects:
+            objects_item = objects_item_data.to_dict()
+            objects.append(objects_item)
+
         field_dict: dict[str, Any] = {}
         field_dict.update(self.additional_properties)
         field_dict.update(
             {
                 "a_string": a_string,
                 "description": description,
                 "files": files,
+                "times": times,
+                "objects": objects,
             }
         )
 
         return field_dict
 
     @classmethod
     def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
-        from ..models.post_body_multipart_response_200_files_item import PostBodyMultipartResponse200FilesItem
+        from ..models.an_object import AnObject
+        from ..models.file import File
 
         d = dict(src_dict)
         a_string = d.pop("a_string")
@@ -59,14 +79,30 @@ def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
         files = []
         _files = d.pop("files")
         for files_item_data in _files:
-            files_item = PostBodyMultipartResponse200FilesItem.from_dict(files_item_data)
+            files_item = File.from_dict(files_item_data)
 
             files.append(files_item)
 
+        times = []
+        _times = d.pop("times")
+        for times_item_data in _times:
+            times_item = isoparse(times_item_data)
+
+            times.append(times_item)
+
+        objects = []
+        _objects = d.pop("objects")
+        for objects_item_data in _objects:
+            objects_item = AnObject.from_dict(objects_item_data)
+
+            objects.append(objects_item)
+
         post_body_multipart_response_200 = cls(
             a_string=a_string,
             description=description,
             files=files,
+            times=times,
+            objects=objects,
         )
 
         post_body_multipart_response_200.additional_properties = d