fix exception in request body with enum ref (#17438)

OpenAPITools · Dec 21, 2023 · a62132e · a62132e
1 parent b5cd4e9
commit a62132e
Show file tree

Hide file tree

Showing 39 changed files with 999 additions and 143 deletions.
diff --git a/...api-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java b/...api-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java
@@ -2200,7 +2200,7 @@ private PythonType getType(CodegenParameter cp) {
                         // TODO process the first one only at the moment
                         if (cmt != null)
                             // TODO: don't loop back to the deprecated getPydanticType method
-                            result = getPydanticType(cmt.getSchema(), typingImports, pydanticImports, datetimeImports, modelImports, exampleImports, postponedModelImports, postponedExampleImports, classname);
+                            return getPydanticType(cmt.getSchema(), typingImports, pydanticImports, datetimeImports, modelImports, exampleImports, postponedModelImports, postponedExampleImports, classname);
                     }
                     throw new RuntimeException("Error! Failed to process getPydanticType when getting the content: " + cp);
                 } else {

diff --git a/modules/openapi-generator/src/main/resources/python/api.mustache b/modules/openapi-generator/src/main/resources/python/api.mustache
@@ -97,8 +97,11 @@ class {{classname}}:
         {{/servers.0}}
 
         _collection_formats: Dict[str, str] = {
-            {{#allParams}}{{#isArray}}
-            '{{baseName}}': '{{collectionFormat}}',{{/isArray}}{{/allParams}}
+            {{#allParams}}
+            {{#isArray}}
+            '{{baseName}}': '{{collectionFormat}}',
+            {{/isArray}}
+            {{/allParams}}
         }
 
         _path_params: Dict[str, str] = {}

diff --git a/...erator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing.yaml b/...erator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing.yaml
@@ -1365,6 +1365,19 @@ paths:
                 type: array
                 items:
                   $ref: "#/components/schemas/ListOfObjects"
+  /fake/ref_enum_string:
+    get:
+      tags:
+        - fake
+      summary: test ref to enum string
+      operationId: fake_ref_enum_string
+      responses:
+        200:
+          description: OK
+          content:
+            plain/text:
+              schema:
+                $ref: "#/components/schemas/EnumClass"
 servers:
   - url: 'http://{server}.swagger.io:{port}/v2'
     description: petstore server

diff --git a/...o_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api/auth_api.py b/...o_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api/auth_api.py
@@ -239,7 +239,6 @@ def _test_auth_http_basic_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -483,7 +482,6 @@ def _test_auth_http_bearer_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}

diff --git a/...o_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api/body_api.py b/...o_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api/body_api.py
@@ -247,7 +247,6 @@ def _test_binary_gif_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -503,7 +502,6 @@ def _test_body_application_octetstream_binary_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -779,7 +777,6 @@ def _test_body_multipart_formdata_array_of_binary_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
             'files': 'csv',
         }
 
@@ -1051,7 +1048,6 @@ def _test_echo_body_all_of_pet_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -1322,7 +1318,6 @@ def _test_echo_body_free_form_object_response_string_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -1593,7 +1588,6 @@ def _test_echo_body_pet_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -1864,7 +1858,6 @@ def _test_echo_body_pet_response_string_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -2135,7 +2128,6 @@ def _test_echo_body_tag_response_string_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}

diff --git a/...o_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api/form_api.py b/...o_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api/form_api.py
@@ -282,7 +282,6 @@ def _test_form_integer_boolean_string_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -622,7 +621,6 @@ def _test_form_oneof_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}

diff --git a/...api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api/header_api.py b/...api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api/header_api.py
@@ -309,7 +309,6 @@ def _test_header_integer_boolean_string_enums_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}

diff --git a/...o_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api/path_api.py b/...o_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api/path_api.py
@@ -294,7 +294,6 @@ def _tests_path_string_path_string_integer_path_integer_enum_nonref_string_path_
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}

diff --git a/..._api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api/query_api.py b/..._api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api/query_api.py
@@ -274,7 +274,6 @@ def _test_enum_ref_string_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -564,7 +563,6 @@ def _test_query_datetime_date_string_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -876,7 +874,6 @@ def _test_query_integer_boolean_string_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -1144,7 +1141,6 @@ def _test_query_style_deep_object_explode_true_object_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -1404,7 +1400,6 @@ def _test_query_style_deep_object_explode_true_object_all_of_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -1664,7 +1659,6 @@ def _test_query_style_form_explode_true_array_string_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -1924,7 +1918,6 @@ def _test_query_style_form_explode_true_object_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -2184,7 +2177,6 @@ def _test_query_style_form_explode_true_object_all_of_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}

diff --git a/samples/client/echo_api/python/openapi_client/api/auth_api.py b/samples/client/echo_api/python/openapi_client/api/auth_api.py
@@ -239,7 +239,6 @@ def _test_auth_http_basic_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -483,7 +482,6 @@ def _test_auth_http_bearer_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}

diff --git a/samples/client/echo_api/python/openapi_client/api/body_api.py b/samples/client/echo_api/python/openapi_client/api/body_api.py
@@ -247,7 +247,6 @@ def _test_binary_gif_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -503,7 +502,6 @@ def _test_body_application_octetstream_binary_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -779,7 +777,6 @@ def _test_body_multipart_formdata_array_of_binary_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
             'files': 'csv',
         }
 
@@ -1051,7 +1048,6 @@ def _test_echo_body_all_of_pet_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -1322,7 +1318,6 @@ def _test_echo_body_free_form_object_response_string_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -1593,7 +1588,6 @@ def _test_echo_body_pet_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -1864,7 +1858,6 @@ def _test_echo_body_pet_response_string_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -2135,7 +2128,6 @@ def _test_echo_body_tag_response_string_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}

diff --git a/samples/client/echo_api/python/openapi_client/api/form_api.py b/samples/client/echo_api/python/openapi_client/api/form_api.py
@@ -282,7 +282,6 @@ def _test_form_integer_boolean_string_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -622,7 +621,6 @@ def _test_form_oneof_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}

diff --git a/samples/client/echo_api/python/openapi_client/api/header_api.py b/samples/client/echo_api/python/openapi_client/api/header_api.py
@@ -309,7 +309,6 @@ def _test_header_integer_boolean_string_enums_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}

diff --git a/samples/client/echo_api/python/openapi_client/api/path_api.py b/samples/client/echo_api/python/openapi_client/api/path_api.py
@@ -294,7 +294,6 @@ def _tests_path_string_path_string_integer_path_integer_enum_nonref_string_path_
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}

diff --git a/samples/client/echo_api/python/openapi_client/api/query_api.py b/samples/client/echo_api/python/openapi_client/api/query_api.py
@@ -274,7 +274,6 @@ def _test_enum_ref_string_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -564,7 +563,6 @@ def _test_query_datetime_date_string_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -876,7 +874,6 @@ def _test_query_integer_boolean_string_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -1144,7 +1141,6 @@ def _test_query_style_deep_object_explode_true_object_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -1404,7 +1400,6 @@ def _test_query_style_deep_object_explode_true_object_all_of_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -1664,7 +1659,6 @@ def _test_query_style_form_explode_true_array_string_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -1924,7 +1918,6 @@ def _test_query_style_form_explode_true_object_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}
@@ -2184,7 +2177,6 @@ def _test_query_style_form_explode_true_object_all_of_serialize(
         _host = None
 
         _collection_formats: Dict[str, str] = {
-
         }
 
         _path_params: Dict[str, str] = {}