refactor: Avoid breaking change

Author: Constantinos Symeonides

end_to_end_tests/golden-record/my_test_api_client/api/tests/upload_file_tests_upload_post.py

@@ -11,7 +11,7 @@
 def _get_kwargs(
     *,
     client: Client,
-    multipart_body: BodyUploadFileTestsUploadPost,
+    multipart_data: BodyUploadFileTestsUploadPost,
     keep_alive: Union[Unset, bool] = UNSET,
 ) -> Dict[str, Any]:
     url = "{}/tests/upload".format(client.base_url)
@@ -22,14 +22,14 @@ def _get_kwargs(
     if keep_alive is not UNSET:
         headers["keep-alive"] = keep_alive
 
-    multipart_multipart_body = multipart_body.to_multipart()
+    multipart_multipart_data = multipart_data.to_multipart()
 
     return {
         "url": url,
         "headers": headers,
         "cookies": cookies,
         "timeout": client.get_timeout(),
-        "files": multipart_multipart_body,
+        "files": multipart_multipart_data,
     }
 
 
@@ -57,12 +57,12 @@ def _build_response(*, response: httpx.Response) -> Response[Union[HTTPValidatio
 def sync_detailed(
     *,
     client: Client,
-    multipart_body: BodyUploadFileTestsUploadPost,
+    multipart_data: BodyUploadFileTestsUploadPost,
     keep_alive: Union[Unset, bool] = UNSET,
 ) -> Response[Union[HTTPValidationError, None]]:
     kwargs = _get_kwargs(
         client=client,
-        multipart_body=multipart_body,
+        multipart_data=multipart_data,
         keep_alive=keep_alive,
     )
 
@@ -76,27 +76,27 @@ def sync_detailed(
 def sync(
     *,
     client: Client,
-    multipart_body: BodyUploadFileTestsUploadPost,
+    multipart_data: BodyUploadFileTestsUploadPost,
     keep_alive: Union[Unset, bool] = UNSET,
 ) -> Optional[Union[HTTPValidationError, None]]:
     """Upload a file"""
 
     return sync_detailed(
         client=client,
-        multipart_body=multipart_body,
+        multipart_data=multipart_data,
         keep_alive=keep_alive,
     ).parsed
 
 
 async def asyncio_detailed(
     *,
     client: Client,
-    multipart_body: BodyUploadFileTestsUploadPost,
+    multipart_data: BodyUploadFileTestsUploadPost,
     keep_alive: Union[Unset, bool] = UNSET,
 ) -> Response[Union[HTTPValidationError, None]]:
     kwargs = _get_kwargs(
         client=client,
-        multipart_body=multipart_body,
+        multipart_data=multipart_data,
         keep_alive=keep_alive,
     )
 
@@ -109,15 +109,15 @@ async def asyncio_detailed(
 async def asyncio(
     *,
     client: Client,
-    multipart_body: BodyUploadFileTestsUploadPost,
+    multipart_data: BodyUploadFileTestsUploadPost,
     keep_alive: Union[Unset, bool] = UNSET,
 ) -> Optional[Union[HTTPValidationError, None]]:
     """Upload a file"""
 
     return (
         await asyncio_detailed(
             client=client,
-            multipart_body=multipart_body,
+            multipart_data=multipart_data,
             keep_alive=keep_alive,
         )
     ).parsed

openapi_python_client/parser/openapi.py

@@ -116,7 +116,7 @@ def parse_multipart_body(
         multipart_body = body_content.get("multipart/form-data")
         if multipart_body is not None and multipart_body.media_type_schema is not None:
             prop, schemas = property_from_data(
-                name="multipart_body",
+                name="multipart_data",
                 required=True,
                 data=multipart_body.media_type_schema,
                 schemas=schemas,

openapi_python_client/templates/endpoint_macros.py.jinja

@@ -101,7 +101,7 @@ form_data: {{ endpoint.form_body_class.name }},
 {% endif %}
 {# Multipart data if any #}
 {% if endpoint.multipart_body %}
-multipart_body: {{ endpoint.multipart_body.get_type_string() }},
+multipart_data: {{ endpoint.multipart_body.get_type_string() }},
 {% endif %}
 {# JSON body if any #}
 {% if endpoint.json_body %}
@@ -130,7 +130,7 @@ client=client,
 form_data=form_data,
 {% endif %}
 {% if endpoint.multipart_body %}
-multipart_body=multipart_body,
+multipart_data=multipart_data,
 {% endif %}
 {% if endpoint.json_body %}
 json_body=json_body,

openapi_python_client/templates/property_templates/list_property.py.jinja

@@ -42,9 +42,10 @@ for {{ inner_source }} in {{ source }}:
 
 {% macro transform(property, source, destination, declare_type=True, stringify=False) %}
 {% set inner_property = property.inner_property %}
-{% set type_string = property.get_type_string(json=True) %}
 {% if stringify %}
     {% set type_string = "Union[Unset, Tuple[None, str, str]]" %}
+{% else %}
+    {% set type_string = property.get_type_string(json=True) %}
 {% endif %}
 {% if property.required %}
 {% if property.nullable %}

openapi_python_client/templates/property_templates/model_property.py.jinja

@@ -12,10 +12,11 @@
 
 {% macro transform(property, source, destination, declare_type=True, stringify=False, transform_method="to_dict") %}
 {% set transformed = source + "." + transform_method + "()" %}
-{% set type_string = property.get_type_string(json=True) %}
 {% if stringify %}
     {% set transformed = "(None, json.dumps(" + transformed + "), 'application/json')" %}
     {% set type_string = "Union[Unset, Tuple[None, str, str]]" %}
+{% else %}
+    {% set type_string = property.get_type_string(json=True) %}
 {% endif %}
 {% if property.required %}
 {% if property.nullable %}

tests/test_parser/test_openapi.py

@@ -187,7 +187,7 @@ def test_parse_multipart_body(self, mocker, model_property_factory):
         result = Endpoint.parse_multipart_body(body=body, schemas=schemas_before, parent_name="parent", config=config)
 
         property_from_data.assert_called_once_with(
-            name="multipart_body",
+            name="multipart_data",
             required=True,
             data=schema,
             schemas=schemas_before,
@@ -218,7 +218,7 @@ def test_parse_multipart_body_existing_schema(self, mocker, model_property_facto
         result = Endpoint.parse_multipart_body(body=body, schemas=schemas_before, parent_name="parent", config=config)
 
         property_from_data.assert_called_once_with(
-            name="multipart_body",
+            name="multipart_data",
             required=True,
             data=schema,
             schemas=schemas_before,