WIP Fix for #926

Author: dbanty

end_to_end_tests/baseline_openapi_3.0.json

@@ -1415,7 +1415,9 @@
     },
     "/naming/mixed-case": {
       "get": {
-        "tags": ["naming"],
+        "tags": [
+          "naming"
+        ],
         "operationId": "mixed_case",
         "parameters": [
           {
@@ -1436,30 +1438,32 @@
           }
         ],
         "responses": {
-            "200": {
-              "description": "Successful response",
-              "content": {
-                "application/json": {
-                  "schema": {
-                    "type": "object",
-                    "properties": {
-                      "mixed_case": {
-                        "type": "string"
-                      },
-                      "mixedCase": {
-                        "type": "string"
-                      }
+          "200": {
+            "description": "Successful response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "mixed_case": {
+                      "type": "string"
+                    },
+                    "mixedCase": {
+                      "type": "string"
                     }
                   }
                 }
               }
             }
+          }
         }
       }
     },
     "/naming/{hyphen-in-path}": {
       "get": {
-        "tags": ["naming"],
+        "tags": [
+          "naming"
+        ],
         "operationId": "hyphen_in_path",
         "parameters": [
           {
@@ -1833,7 +1837,8 @@
         "required": [
           "some_file",
           "some_object",
-          "some_nullable_object"
+          "some_nullable_object",
+          "some_required_number"
         ],
         "type": "object",
         "properties": {
@@ -1866,6 +1871,15 @@
             "title": "Some Number",
             "type": "number"
           },
+          "some_nullable_number": {
+            "title": "Some Nullable Number",
+            "type": "number",
+            "nullable": true
+          },
+          "some_required_number": {
+            "title": "Some Required Number",
+            "type": "number"
+          },
           "some_array": {
             "title": "Some Array",
             "nullable": true,

end_to_end_tests/baseline_openapi_3.1.yaml

@@ -1847,7 +1847,8 @@ info:
       "required": [
         "some_file",
         "some_object",
-        "some_nullable_object"
+        "some_nullable_object",
+        "some_required_number"
       ],
       "type": "object",
       "properties": {
@@ -1880,6 +1881,14 @@ info:
           "title": "Some Number",
           "type": "number"
         },
+        "some_nullable_number": {
+          "title": "Some Nullable Number",
+          "type": [ "number", "null" ]
+        },
+        "some_required_number": {
+          "title": "Some Number",
+          "type": "number"
+        },
         "some_array": {
           "title": "Some Array",
           "type": [ "array", "null" ],

end_to_end_tests/golden-record/my_test_api_client/models/body_upload_file_tests_upload_post.py

@@ -32,26 +32,30 @@ class BodyUploadFileTestsUploadPost:
     """
     Attributes:
         some_file (File):
+        some_required_number (float):
         some_object (BodyUploadFileTestsUploadPostSomeObject):
         some_nullable_object (Union['BodyUploadFileTestsUploadPostSomeNullableObject', None]):
         some_optional_file (Union[Unset, File]):
         some_string (Union[Unset, str]):  Default: 'some_default_string'.
         a_datetime (Union[Unset, datetime.datetime]):
         a_date (Union[Unset, datetime.date]):
         some_number (Union[Unset, float]):
+        some_nullable_number (Union[None, Unset, float]):
         some_array (Union[List['AFormData'], None, Unset]):
         some_optional_object (Union[Unset, BodyUploadFileTestsUploadPostSomeOptionalObject]):
         some_enum (Union[Unset, DifferentEnum]): An enumeration.
     """
 
     some_file: File
+    some_required_number: float
     some_object: "BodyUploadFileTestsUploadPostSomeObject"
     some_nullable_object: Union["BodyUploadFileTestsUploadPostSomeNullableObject", None]
     some_optional_file: Union[Unset, File] = UNSET
     some_string: Union[Unset, str] = "some_default_string"
     a_datetime: Union[Unset, datetime.datetime] = UNSET
     a_date: Union[Unset, datetime.date] = UNSET
     some_number: Union[Unset, float] = UNSET
+    some_nullable_number: Union[None, Unset, float] = UNSET
     some_array: Union[List["AFormData"], None, Unset] = UNSET
     some_optional_object: Union[Unset, "BodyUploadFileTestsUploadPostSomeOptionalObject"] = UNSET
     some_enum: Union[Unset, DifferentEnum] = UNSET
@@ -66,6 +70,8 @@ def to_dict(self) -> Dict[str, Any]:
 
         some_file = self.some_file.to_tuple()
 
+        some_required_number = self.some_required_number
+
         some_object = self.some_object.to_dict()
 
         some_nullable_object: Union[Dict[str, Any], None]
@@ -90,6 +96,12 @@ def to_dict(self) -> Dict[str, Any]:
 
         some_number = self.some_number
 
+        some_nullable_number: Union[None, Unset, float]
+        if isinstance(self.some_nullable_number, Unset):
+            some_nullable_number = UNSET
+        else:
+            some_nullable_number = self.some_nullable_number
+
         some_array: Union[List[Dict[str, Any]], None, Unset]
         if isinstance(self.some_array, Unset):
             some_array = UNSET
@@ -116,6 +128,7 @@ def to_dict(self) -> Dict[str, Any]:
         field_dict.update(
             {
                 "some_file": some_file,
+                "some_required_number": some_required_number,
                 "some_object": some_object,
                 "some_nullable_object": some_nullable_object,
             }
@@ -130,6 +143,8 @@ def to_dict(self) -> Dict[str, Any]:
             field_dict["a_date"] = a_date
         if some_number is not UNSET:
             field_dict["some_number"] = some_number
+        if some_nullable_number is not UNSET:
+            field_dict["some_nullable_number"] = some_nullable_number
         if some_array is not UNSET:
             field_dict["some_array"] = some_array
         if some_optional_object is not UNSET:
@@ -142,13 +157,16 @@ def to_dict(self) -> Dict[str, Any]:
     def to_multipart(self) -> Dict[str, Any]:
         some_file = self.some_file.to_tuple()
 
+        some_required_number = (None, str(self.some_required_number).encode(), "text/plain")
+
         some_object = (None, json.dumps(self.some_object.to_dict()).encode(), "application/json")
 
-        some_nullable_object: Union[None, Tuple[None, bytes, str]]
+        some_nullable_object: Tuple[None, bytes, str]
+
         if isinstance(self.some_nullable_object, BodyUploadFileTestsUploadPostSomeNullableObject):
             some_nullable_object = (None, json.dumps(self.some_nullable_object.to_dict()).encode(), "application/json")
         else:
-            some_nullable_object = self.some_nullable_object
+            some_nullable_object = (None, str(self.some_nullable_object).encode(), "text/plain")
 
         some_optional_file: Union[Unset, FileJsonType] = UNSET
         if not isinstance(self.some_optional_file, Unset):
@@ -174,7 +192,18 @@ def to_multipart(self) -> Dict[str, Any]:
             else (None, str(self.some_number).encode(), "text/plain")
         )
 
-        some_array: Union[None, Tuple[None, bytes, str], Unset]
+        some_nullable_number: Union[Tuple[None, bytes, str], Unset]
+
+        if isinstance(self.some_nullable_number, Unset):
+            some_nullable_number = UNSET
+        elif isinstance(self.some_nullable_number, float):
+            some_nullable_number = (None, str(self.some_nullable_number).encode(), "text/plain")
+
+        else:
+            some_nullable_number = (None, str(self.some_nullable_number).encode(), "text/plain")
+
+        some_array: Union[Tuple[None, bytes, str], Unset]
+
         if isinstance(self.some_array, Unset):
             some_array = UNSET
         elif isinstance(self.some_array, list):
@@ -185,7 +214,7 @@ def to_multipart(self) -> Dict[str, Any]:
             some_array = (None, json.dumps(_temp_some_array).encode(), "application/json")
 
         else:
-            some_array = self.some_array
+            some_array = (None, str(self.some_array).encode(), "text/plain")
 
         some_optional_object: Union[Unset, Tuple[None, bytes, str]] = UNSET
         if not isinstance(self.some_optional_object, Unset):
@@ -201,6 +230,7 @@ def to_multipart(self) -> Dict[str, Any]:
         field_dict.update(
             {
                 "some_file": some_file,
+                "some_required_number": some_required_number,
                 "some_object": some_object,
                 "some_nullable_object": some_nullable_object,
             }
@@ -215,6 +245,8 @@ def to_multipart(self) -> Dict[str, Any]:
             field_dict["a_date"] = a_date
         if some_number is not UNSET:
             field_dict["some_number"] = some_number
+        if some_nullable_number is not UNSET:
+            field_dict["some_nullable_number"] = some_nullable_number
         if some_array is not UNSET:
             field_dict["some_array"] = some_array
         if some_optional_object is not UNSET:
@@ -241,6 +273,8 @@ def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
         d = src_dict.copy()
         some_file = File(payload=BytesIO(d.pop("some_file")))
 
+        some_required_number = d.pop("some_required_number")
+
         some_object = BodyUploadFileTestsUploadPostSomeObject.from_dict(d.pop("some_object"))
 
         def _parse_some_nullable_object(data: object) -> Union["BodyUploadFileTestsUploadPostSomeNullableObject", None]:
@@ -283,6 +317,15 @@ def _parse_some_nullable_object(data: object) -> Union["BodyUploadFileTestsUploa
 
         some_number = d.pop("some_number", UNSET)
 
+        def _parse_some_nullable_number(data: object) -> Union[None, Unset, float]:
+            if data is None:
+                return data
+            if isinstance(data, Unset):
+                return data
+            return cast(Union[None, Unset, float], data)
+
+        some_nullable_number = _parse_some_nullable_number(d.pop("some_nullable_number", UNSET))
+
         def _parse_some_array(data: object) -> Union[List["AFormData"], None, Unset]:
             if data is None:
                 return data
@@ -321,13 +364,15 @@ def _parse_some_array(data: object) -> Union[List["AFormData"], None, Unset]:
 
         body_upload_file_tests_upload_post = cls(
             some_file=some_file,
+            some_required_number=some_required_number,
             some_object=some_object,
             some_nullable_object=some_nullable_object,
             some_optional_file=some_optional_file,
             some_string=some_string,
             a_datetime=a_datetime,
             a_date=a_date,
             some_number=some_number,
+            some_nullable_number=some_nullable_number,
             some_array=some_array,
             some_optional_object=some_optional_object,
             some_enum=some_enum,

end_to_end_tests/golden-record/my_test_api_client/models/post_bodies_multiple_files_body.py

@@ -33,9 +33,7 @@ def to_multipart(self) -> Dict[str, Any]:
         a = self.a if isinstance(self.a, Unset) else (None, str(self.a).encode(), "text/plain")
 
         field_dict: Dict[str, Any] = {}
-        field_dict.update(
-            {key: (None, str(value).encode(), "text/plain") for key, value in self.additional_properties.items()}
-        )
+        field_dict.update(self.additional_properties)
         field_dict.update({})
         if a is not UNSET:
             field_dict["a"] = a

integration-tests/integration_tests/models/post_body_multipart_body.py

@@ -45,9 +45,7 @@ def to_dict(self) -> Dict[str, Any]:
         return field_dict
 
     def to_multipart(self) -> Dict[str, Any]:
-        a_string = (
-            self.a_string if isinstance(self.a_string, Unset) else (None, str(self.a_string).encode(), "text/plain")
-        )
+        a_string = (None, str(self.a_string).encode(), "text/plain")
 
         file = self.file.to_tuple()
 
@@ -58,9 +56,7 @@ def to_multipart(self) -> Dict[str, Any]:
         )
 
         field_dict: Dict[str, Any] = {}
-        field_dict.update(
-            {key: (None, str(value).encode(), "text/plain") for key, value in self.additional_properties.items()}
-        )
+        field_dict.update(self.additional_properties)
         field_dict.update(
             {
                 "a_string": a_string,

openapi_python_client/parser/properties/protocol.py

@@ -107,6 +107,8 @@ def get_type_string(
         """
         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/templates/endpoint_macros.py.jinja

@@ -83,8 +83,8 @@ params = {k: v for k, v in params.items() if v is not UNSET and v is not None}
 {% macro multipart_body(body, destination) %}
 {% set property = body.prop %}
 {% import "property_templates/" + property.template as prop_template %}
-{% if prop_template.transform_multipart %}
-{{ prop_template.transform_multipart(property, property.python_name, destination) }}
+{% if prop_template.transform_multipart_body %}
+{{ prop_template.transform_multipart_body(property, property.python_name, destination) }}
 {% endif %}
 {% endmacro %}
 

openapi_python_client/templates/model.py.jinja

@@ -80,10 +80,10 @@ class {{ class_name }}:
 {% macro _to_dict(multipart=False) %}
 {% for property in model.required_properties + model.optional_properties %}
 {% 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")
+{% 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) }}
 {% else %}
 {{ property.python_name }} = self.{{ property.python_name }}
 {% endif %}
@@ -97,14 +97,12 @@ field_dict: Dict[str, Any] = {}
 {% else %}
     {% set prop_template = None %}
 {% endif %}
-{% if prop_template and prop_template.transform %}
+{% if prop_template and multipart %}
 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) }}
-{% elif multipart %}
-field_dict.update({
-    key: (None, str(value).encode(), "text/plain")
-    for key, value in self.additional_properties.items()
-})
+    {{ prop_template.transform_multipart(model.additional_properties, "prop", "field_dict[prop_name]") | indent(4) }}
+{% elif 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]", declare_type=false) | indent(4) }}
 {% else %}
 field_dict.update(self.additional_properties)
 {% endif %}

openapi_python_client/templates/property_templates/any_property.py.jinja

@@ -0,0 +1,7 @@
+{% macro transform_multipart(property, source, destination) %}
+{% if not property.required %}
+{{ destination }} = {{source}} if isinstance({{source}}, Unset) else (None, str({{source}}).encode(), "text/plain")
+{% else %}
+{{ destination }} =  (None, str({{ source }}).encode(), "text/plain")
+{% endif %}
+{% endmacro %}

openapi_python_client/templates/property_templates/boolean_property.py.jinja

@@ -1,3 +1,11 @@
 {% macro transform_header(source) %}
 "true" if {{ source }} else "false"
 {% endmacro %}
+
+{% macro transform_multipart(property, source, destination) %}
+{% if not property.required %}
+{{ destination }} = {{source}} if isinstance({{source}}, Unset) else (None, str({{source}}).encode(), "text/plain")
+{% else %}
+{{ destination }} =  (None, str({{ source }}).encode(), "text/plain")
+{% endif %}
+{% endmacro %}