Handles ref request bodies in operation body type hint

Author: spacether

modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_args_optional.hbs

@@ -1,25 +1,7 @@
 {{#if requestBody}}
     {{#with requestBody}}
         {{#if refInfo}}
-            {{#with getDeepestRef}}
-                {{#unless required}}
-body: typing.Union[
-                    {{#each content}}
-                        {{#with schema}}
-                            {{#if refInfo.refClass}}
-    {{> components/schemas/_helper_schema_output_ref_type mode="unprefixed" fullRefModule=(join "request_body" ../../../refInfo.refModule "content" ../@key.snakeCase "schema" ".") endChar="," }}
-                            {{else}}
-    {{> components/schemas/_helper_schema_output_type mode="unprefixed" fullRefModule=(join "request_body" ../../../refInfo.refModule "content" ../@key.snakeCase "schema" ".") endChar="," }}
-                            {{/if}}
-                        {{/with}}
-                    {{/each}}
-    schemas.Unset,
-                    {{#each getContentSchemas}}
-    {{> _helper_schema_python_types_newline }}
-                    {{/each}}
-] = schemas.unset,
-                {{/unless}}
-            {{/with}}
+{{> paths/path/verb/_helper_operation_args_ref_body fullRefModule="" requiredValue=true }}
         {{else}}
             {{#unless required}}
 body: typing.Union[

modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_args_ref_body.hbs

@@ -0,0 +1,29 @@
+{{#if refInfo}}
+    {{#with refInfo.ref}}
+        {{#eq fullRefModule "" }}
+{{> paths/path/verb/_helper_operation_args_ref_body fullRefModule=../refInfo.refModule }}
+        {{else}}
+{{> paths/path/verb/_helper_operation_args_ref_body fullRefModule=(join fullRefModule ../refInfo.refModule ".") }}
+        {{/eq}}
+    {{/with}}
+{{else}}
+    {{#eq required requiredValue}}
+body: typing.Union[
+        {{#each content}}
+            {{#with schema}}
+                {{#if refInfo.refClass}}
+    {{> components/schemas/_helper_schema_output_ref_type mode="unprefixed" fullRefModule=(join "request_body" fullRefModule "content" ../@key.snakeCase "schema" ".") endChar="," }}
+                {{else}}
+    {{> components/schemas/_helper_schema_output_type mode="unprefixed" fullRefModule=(join "request_body" fullRefModule "content" ../@key.snakeCase "schema" ".") endChar="," }}
+                {{/if}}
+            {{/with}}
+        {{/each}}
+        {{#unless required}}
+    schemas.Unset,
+        {{/unless}}
+        {{#each getContentSchemas}}
+    {{> _helper_schema_python_types_newline }}
+        {{/each}}
+]{{#unless required}} = schemas.unset{{/unless}},
+    {{/eq}}
+{{/if}}

modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_args_required.hbs

@@ -1,24 +1,7 @@
 {{#if requestBody}}
     {{#with requestBody}}
         {{#if refInfo}}
-            {{#with getDeepestRef}}
-                {{#if required}}
-body: typing.Union[
-                    {{#each content}}
-                        {{#with schema}}
-                            {{#if refInfo.refClass}}
-    {{> components/schemas/_helper_schema_output_ref_type mode="unprefixed" fullRefModule=(join "request_body" ../../../refInfo.refModule "content" ../@key.snakeCase "schema" ".") endChar="," }}
-                            {{else}}
-    {{> components/schemas/_helper_schema_output_type mode="unprefixed" fullRefModule=(join "request_body" ../../../refInfo.refModule "content" ../@key.snakeCase "schema" ".") endChar="," }}
-                            {{/if}}
-                        {{/with}}
-                    {{/each}}
-                    {{#each getContentSchemas}}
-    {{> _helper_schema_python_types_newline }}
-                    {{/each}}
-],
-                {{/if}}
-            {{/with}}
+{{> paths/path/verb/_helper_operation_args_ref_body fullRefModule="" requiredValue=true }}
         {{else}}
             {{#if required}}
 body: typing.Union[

samples/openapi3/client/petstore/python/src/petstore_api/paths/another_fake_dummy/patch/operation.py

@@ -37,6 +37,11 @@ def _call_123_test__special_tags(
             dict,
             immutabledict.immutabledict
         ],
+        body: typing.Union[
+            request_body.request_body_client.content.application_json.schema.client.ClientDict,
+            dict,
+            immutabledict.immutabledict
+        ],
         content_type: typing_extensions.Literal["application/json"] = "application/json",
         accept_content_types: typing.Tuple[str, ...] = _all_accept_content_types,
         server_index: typing.Optional[int] = None,
@@ -53,6 +58,11 @@ def _call_123_test__special_tags(
             dict,
             immutabledict.immutabledict
         ],
+        body: typing.Union[
+            request_body.request_body_client.content.application_json.schema.client.ClientDict,
+            dict,
+            immutabledict.immutabledict
+        ],
         content_type: typing_extensions.Literal["application/json"] = "application/json",
         accept_content_types: typing.Tuple[str, ...] = _all_accept_content_types,
         server_index: typing.Optional[int] = None,
@@ -68,6 +78,11 @@ def _call_123_test__special_tags(
             dict,
             immutabledict.immutabledict
         ],
+        body: typing.Union[
+            request_body.request_body_client.content.application_json.schema.client.ClientDict,
+            dict,
+            immutabledict.immutabledict
+        ],
         content_type: typing_extensions.Literal["application/json"] = "application/json",
         accept_content_types: typing.Tuple[str, ...] = _all_accept_content_types,
         server_index: typing.Optional[int] = None,

samples/openapi3/client/petstore/python/src/petstore_api/paths/fake/patch/operation.py

@@ -37,6 +37,11 @@ def _client_model(
             dict,
             immutabledict.immutabledict
         ],
+        body: typing.Union[
+            request_body.request_body_client.content.application_json.schema.client.ClientDict,
+            dict,
+            immutabledict.immutabledict
+        ],
         content_type: typing_extensions.Literal["application/json"] = "application/json",
         accept_content_types: typing.Tuple[str, ...] = _all_accept_content_types,
         server_index: typing.Optional[int] = None,
@@ -53,6 +58,11 @@ def _client_model(
             dict,
             immutabledict.immutabledict
         ],
+        body: typing.Union[
+            request_body.request_body_client.content.application_json.schema.client.ClientDict,
+            dict,
+            immutabledict.immutabledict
+        ],
         content_type: typing_extensions.Literal["application/json"] = "application/json",
         accept_content_types: typing.Tuple[str, ...] = _all_accept_content_types,
         server_index: typing.Optional[int] = None,
@@ -68,6 +78,11 @@ def _client_model(
             dict,
             immutabledict.immutabledict
         ],
+        body: typing.Union[
+            request_body.request_body_client.content.application_json.schema.client.ClientDict,
+            dict,
+            immutabledict.immutabledict
+        ],
         content_type: typing_extensions.Literal["application/json"] = "application/json",
         accept_content_types: typing.Tuple[str, ...] = _all_accept_content_types,
         server_index: typing.Optional[int] = None,

samples/openapi3/client/petstore/python/src/petstore_api/paths/fake_classname_test/patch/operation.py

@@ -42,6 +42,11 @@ def _classname(
             dict,
             immutabledict.immutabledict
         ],
+        body: typing.Union[
+            request_body.request_body_client.content.application_json.schema.client.ClientDict,
+            dict,
+            immutabledict.immutabledict
+        ],
         content_type: typing_extensions.Literal["application/json"] = "application/json",
         accept_content_types: typing.Tuple[str, ...] = _all_accept_content_types,
         security_index: typing.Optional[int] = None,
@@ -59,6 +64,11 @@ def _classname(
             dict,
             immutabledict.immutabledict
         ],
+        body: typing.Union[
+            request_body.request_body_client.content.application_json.schema.client.ClientDict,
+            dict,
+            immutabledict.immutabledict
+        ],
         content_type: typing_extensions.Literal["application/json"] = "application/json",
         accept_content_types: typing.Tuple[str, ...] = _all_accept_content_types,
         security_index: typing.Optional[int] = None,
@@ -75,6 +85,11 @@ def _classname(
             dict,
             immutabledict.immutabledict
         ],
+        body: typing.Union[
+            request_body.request_body_client.content.application_json.schema.client.ClientDict,
+            dict,
+            immutabledict.immutabledict
+        ],
         content_type: typing_extensions.Literal["application/json"] = "application/json",
         accept_content_types: typing.Tuple[str, ...] = _all_accept_content_types,
         security_index: typing.Optional[int] = None,

samples/openapi3/client/petstore/python/src/petstore_api/paths/pet/post/operation.py

@@ -50,6 +50,12 @@ def _add_pet(
             dict,
             immutabledict.immutabledict
         ],
+        body: typing.Union[
+            request_body.request_body_pet.content.application_json.schema.pet.PetDict,
+            request_body.request_body_pet.content.application_xml.schema.ref_pet.pet.PetDict,
+            dict,
+            immutabledict.immutabledict
+        ],
         content_type: typing_extensions.Literal[
             "application/json",
             "application/xml",
@@ -70,6 +76,12 @@ def _add_pet(
             dict,
             immutabledict.immutabledict
         ],
+        body: typing.Union[
+            request_body.request_body_pet.content.application_json.schema.pet.PetDict,
+            request_body.request_body_pet.content.application_xml.schema.ref_pet.pet.PetDict,
+            dict,
+            immutabledict.immutabledict
+        ],
         content_type: typing_extensions.Literal[
             "application/json",
             "application/xml",
@@ -89,6 +101,12 @@ def _add_pet(
             dict,
             immutabledict.immutabledict
         ],
+        body: typing.Union[
+            request_body.request_body_pet.content.application_json.schema.pet.PetDict,
+            request_body.request_body_pet.content.application_xml.schema.ref_pet.pet.PetDict,
+            dict,
+            immutabledict.immutabledict
+        ],
         content_type: typing_extensions.Literal[
             "application/json",
             "application/xml",

samples/openapi3/client/petstore/python/src/petstore_api/paths/pet/put/operation.py

@@ -51,6 +51,12 @@ def _update_pet(
             dict,
             immutabledict.immutabledict
         ],
+        body: typing.Union[
+            request_body.request_body_pet.content.application_json.schema.pet.PetDict,
+            request_body.request_body_pet.content.application_xml.schema.ref_pet.pet.PetDict,
+            dict,
+            immutabledict.immutabledict
+        ],
         content_type: typing_extensions.Literal[
             "application/json",
             "application/xml",
@@ -70,6 +76,12 @@ def _update_pet(
             dict,
             immutabledict.immutabledict
         ],
+        body: typing.Union[
+            request_body.request_body_pet.content.application_json.schema.pet.PetDict,
+            request_body.request_body_pet.content.application_xml.schema.ref_pet.pet.PetDict,
+            dict,
+            immutabledict.immutabledict
+        ],
         content_type: typing_extensions.Literal[
             "application/json",
             "application/xml",
@@ -89,6 +101,12 @@ def _update_pet(
             dict,
             immutabledict.immutabledict
         ],
+        body: typing.Union[
+            request_body.request_body_pet.content.application_json.schema.pet.PetDict,
+            request_body.request_body_pet.content.application_xml.schema.ref_pet.pet.PetDict,
+            dict,
+            immutabledict.immutabledict
+        ],
         content_type: typing_extensions.Literal[
             "application/json",
             "application/xml",

samples/openapi3/client/petstore/python/src/petstore_api/paths/user_create_with_array/post/operation.py

@@ -25,6 +25,11 @@ def _create_users_with_array_input(
             list,
             tuple
         ],
+        body: typing.Union[
+            request_body.request_body_user_array.content.application_json.schema.SchemaTuple,
+            list,
+            tuple
+        ],
         content_type: typing_extensions.Literal["application/json"] = "application/json",
         server_index: typing.Optional[int] = None,
         stream: bool = False,
@@ -40,6 +45,11 @@ def _create_users_with_array_input(
             list,
             tuple
         ],
+        body: typing.Union[
+            request_body.request_body_user_array.content.application_json.schema.SchemaTuple,
+            list,
+            tuple
+        ],
         content_type: typing_extensions.Literal["application/json"] = "application/json",
         server_index: typing.Optional[int] = None,
         stream: bool = False,
@@ -54,6 +64,11 @@ def _create_users_with_array_input(
             list,
             tuple
         ],
+        body: typing.Union[
+            request_body.request_body_user_array.content.application_json.schema.SchemaTuple,
+            list,
+            tuple
+        ],
         content_type: typing_extensions.Literal["application/json"] = "application/json",
         server_index: typing.Optional[int] = None,
         stream: bool = False,

samples/openapi3/client/petstore/python/src/petstore_api/paths/user_create_with_list/post/operation.py

@@ -21,7 +21,12 @@ class BaseApi(api_client.Api):
     def _create_users_with_list_input(
         self,
         body: typing.Union[
-            request_body.request_body_ref_user_array.content.application_json.schema.SchemaTuple,
+            request_body.request_body_ref_user_array.request_body_user_array.content.application_json.schema.SchemaTuple,
+            list,
+            tuple
+        ],
+        body: typing.Union[
+            request_body.request_body_ref_user_array.request_body_user_array.content.application_json.schema.SchemaTuple,
             list,
             tuple
         ],
@@ -36,7 +41,12 @@ def _create_users_with_list_input(
     def _create_users_with_list_input(
         self,
         body: typing.Union[
-            request_body.request_body_ref_user_array.content.application_json.schema.SchemaTuple,
+            request_body.request_body_ref_user_array.request_body_user_array.content.application_json.schema.SchemaTuple,
+            list,
+            tuple
+        ],
+        body: typing.Union[
+            request_body.request_body_ref_user_array.request_body_user_array.content.application_json.schema.SchemaTuple,
             list,
             tuple
         ],
@@ -50,7 +60,12 @@ def _create_users_with_list_input(
     def _create_users_with_list_input(
         self,
         body: typing.Union[
-            request_body.request_body_ref_user_array.content.application_json.schema.SchemaTuple,
+            request_body.request_body_ref_user_array.request_body_user_array.content.application_json.schema.SchemaTuple,
+            list,
+            tuple
+        ],
+        body: typing.Union[
+            request_body.request_body_ref_user_array.request_body_user_array.content.application_json.schema.SchemaTuple,
             list,
             tuple
         ],