fix: Don't manually set multipart/form-data content-type

dbanty · dbanty · commit d40491eb903b · 2023-12-17T11:33:17.000-07:00
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/bodies/json_like.py b/end_to_end_tests/golden-record/my_test_api_client/api/bodies/json_like.py
@@ -13,7 +13,7 @@ def _get_kwargs(
     *,
     body: JsonLikeBody,
 ) -> Dict[str, Any]:
-    headers = {}
+    headers: Dict[str, Any] = {}
 
     _kwargs: Dict[str, Any] = {
         "method": "post",
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/bodies/post_bodies_multiple.py b/end_to_end_tests/golden-record/my_test_api_client/api/bodies/post_bodies_multiple.py
@@ -20,7 +20,7 @@ def _get_kwargs(
         PostBodiesMultipleFilesBody,
     ],
 ) -> Dict[str, Any]:
-    headers = {}
+    headers: Dict[str, Any] = {}
 
     _kwargs: Dict[str, Any] = {
         "method": "post",
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/location/get_location_header_types.py b/end_to_end_tests/golden-record/my_test_api_client/api/location/get_location_header_types.py
@@ -19,7 +19,7 @@ def _get_kwargs(
     int_enum_header: Union[Unset, GetLocationHeaderTypesIntEnumHeader] = UNSET,
     string_enum_header: Union[Unset, GetLocationHeaderTypesStringEnumHeader] = UNSET,
 ) -> Dict[str, Any]:
-    headers = {}
+    headers: Dict[str, Any] = {}
     if not isinstance(boolean_header, Unset):
         headers["Boolean-Header"] = "true" if boolean_header else "false"
 
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/naming/post_naming_property_conflict_with_import.py b/end_to_end_tests/golden-record/my_test_api_client/api/naming/post_naming_property_conflict_with_import.py
@@ -16,7 +16,7 @@ def _get_kwargs(
     *,
     body: PostNamingPropertyConflictWithImportBody,
 ) -> Dict[str, Any]:
-    headers = {}
+    headers: Dict[str, Any] = {}
 
     _kwargs: Dict[str, Any] = {
         "method": "post",
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/parameter_references/get_parameter_references_path_param.py b/end_to_end_tests/golden-record/my_test_api_client/api/parameter_references/get_parameter_references_path_param.py
@@ -16,7 +16,7 @@ def _get_kwargs(
     header_param: Union[Unset, str] = UNSET,
     cookie_param: Union[Unset, str] = UNSET,
 ) -> Dict[str, Any]:
-    headers = {}
+    headers: Dict[str, Any] = {}
     if not isinstance(header_param, Unset):
         headers["header param"] = header_param
 
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/parameters/get_same_name_multiple_locations_param.py b/end_to_end_tests/golden-record/my_test_api_client/api/parameters/get_same_name_multiple_locations_param.py
@@ -15,7 +15,7 @@ def _get_kwargs(
     param_header: Union[Unset, str] = UNSET,
     param_cookie: Union[Unset, str] = UNSET,
 ) -> Dict[str, Any]:
-    headers = {}
+    headers: Dict[str, Any] = {}
     if not isinstance(param_header, Unset):
         headers["param"] = param_header
 
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/callback_test.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/callback_test.py
@@ -14,7 +14,7 @@ def _get_kwargs(
     *,
     body: AModel,
 ) -> Dict[str, Any]:
-    headers = {}
+    headers: Dict[str, Any] = {}
 
     _kwargs: Dict[str, Any] = {
         "method": "post",
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/json_body_tests_json_body_post.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/json_body_tests_json_body_post.py
@@ -14,7 +14,7 @@ def _get_kwargs(
     *,
     body: AModel,
 ) -> Dict[str, Any]:
-    headers = {}
+    headers: Dict[str, Any] = {}
 
     _kwargs: Dict[str, Any] = {
         "method": "post",
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/octet_stream_tests_octet_stream_post.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/octet_stream_tests_octet_stream_post.py
@@ -13,7 +13,7 @@ def _get_kwargs(
     *,
     body: File,
 ) -> Dict[str, Any]:
-    headers = {}
+    headers: Dict[str, Any] = {}
 
     _kwargs: Dict[str, Any] = {
         "method": "post",
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/post_form_data.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/post_form_data.py
@@ -13,7 +13,7 @@ def _get_kwargs(
     *,
     body: AFormData,
 ) -> Dict[str, Any]:
-    headers = {}
+    headers: Dict[str, Any] = {}
 
     _kwargs: Dict[str, Any] = {
         "method": "post",
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/post_form_data_inline.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/post_form_data_inline.py
@@ -13,7 +13,7 @@ def _get_kwargs(
     *,
     body: PostFormDataInlineBody,
 ) -> Dict[str, Any]:
-    headers = {}
+    headers: Dict[str, Any] = {}
 
     _kwargs: Dict[str, Any] = {
         "method": "post",
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/post_tests_json_body_string.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/post_tests_json_body_string.py
@@ -13,7 +13,7 @@ def _get_kwargs(
     *,
     body: str,
 ) -> Dict[str, Any]:
-    headers = {}
+    headers: Dict[str, Any] = {}
 
     _kwargs: Dict[str, Any] = {
         "method": "post",
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/test_inline_objects.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/test_inline_objects.py
@@ -14,7 +14,7 @@ def _get_kwargs(
     *,
     body: TestInlineObjectsBody,
 ) -> Dict[str, Any]:
-    headers = {}
+    headers: Dict[str, Any] = {}
 
     _kwargs: Dict[str, Any] = {
         "method": "post",
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/upload_file_tests_upload_post.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/upload_file_tests_upload_post.py
@@ -14,7 +14,7 @@ def _get_kwargs(
     *,
     body: BodyUploadFileTestsUploadPost,
 ) -> Dict[str, Any]:
-    headers = {}
+    headers: Dict[str, Any] = {}
 
     _kwargs: Dict[str, Any] = {
         "method": "post",
@@ -24,7 +24,6 @@ def _get_kwargs(
     _body = body.to_multipart()
 
     _kwargs["files"] = _body
-    headers["Content-Type"] = "multipart/form-data"
 
     _kwargs["headers"] = headers
     return _kwargs
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/upload_multiple_files_tests_upload_post.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/upload_multiple_files_tests_upload_post.py
@@ -13,7 +13,7 @@ def _get_kwargs(
     *,
     body: List[File],
 ) -> Dict[str, Any]:
-    headers = {}
+    headers: Dict[str, Any] = {}
 
     _kwargs: Dict[str, Any] = {
         "method": "post",
@@ -27,7 +27,6 @@ def _get_kwargs(
         _body.append(body_item)
 
     _kwargs["files"] = _body
-    headers["Content-Type"] = "multipart/form-data"
 
     _kwargs["headers"] = headers
     return _kwargs
diff --git a/integration-tests/integration_tests/api/body/post_body_multipart.py b/integration-tests/integration_tests/api/body/post_body_multipart.py
@@ -15,7 +15,7 @@ def _get_kwargs(
     *,
     body: PostBodyMultipartBody,
 ) -> Dict[str, Any]:
-    headers = {}
+    headers: Dict[str, Any] = {}
 
     _kwargs: Dict[str, Any] = {
         "method": "post",
@@ -25,7 +25,6 @@ def _get_kwargs(
     _body = body.to_multipart()
 
     _kwargs["files"] = _body
-    headers["Content-Type"] = "multipart/form-data"
 
     _kwargs["headers"] = headers
     return _kwargs
diff --git a/integration-tests/integration_tests/api/parameters/post_parameters_header.py b/integration-tests/integration_tests/api/parameters/post_parameters_header.py
@@ -17,7 +17,7 @@ def _get_kwargs(
     number_header: float,
     integer_header: int,
 ) -> Dict[str, Any]:
-    headers = {}
+    headers: Dict[str, Any] = {}
     headers["Boolean-Header"] = "true" if boolean_header else "false"
 
     headers["String-Header"] = string_header
diff --git a/openapi_python_client/templates/endpoint_macros.py.jinja b/openapi_python_client/templates/endpoint_macros.py.jinja
@@ -3,7 +3,7 @@
 
 {% macro header_params(endpoint) %}
 {% if endpoint.header_parameters or endpoint.bodies | length > 0 %}
-headers = {}
+headers: Dict[str, Any] = {}
 {% if endpoint.header_parameters %}
     {% for parameter in endpoint.header_parameters.values() %}
         {% import "property_templates/" + parameter.template as param_template %}
diff --git a/openapi_python_client/templates/endpoint_module.py.jinja b/openapi_python_client/templates/endpoint_module.py.jinja
@@ -57,7 +57,9 @@ def _get_kwargs(
 {% set body = endpoint.bodies[0] %}
     {{ body_to_kwarg(body, "_body") | indent(4) }}
     _kwargs["{{ body.body_type.value }}"] = _body
+    {% if body.content_type != "multipart/form-data" %} {# Need httpx to set the boundary automatically #}
     headers["Content-Type"] = "{{ body.content_type }}"
+    {% endif %}
 {% endif %}
 
 {% if endpoint.header_parameters or endpoint.bodies | length > 0 %}
