Handle overload in existing template

Author: EltonChou

modules/openapi-json-schema-generator/src/main/resources/python/endpoint.handlebars

@@ -388,19 +388,18 @@ class BaseApi(api_client.Api):
 
     @typing.overload
     def _{{operationId}}_oapg(
-    {{> endpoint_args_overload selfType="api_client.Api" isSkip=false}}
+    {{> endpoint_args isOverload=true skipDeserialization="False"}}
 
     @typing.overload
     def _{{operationId}}_oapg(
-    {{> endpoint_args_overload selfType="api_client.Api" isSkip=true}}
+    {{> endpoint_args isOverload=true skipDeserialization="True"}}
 
     @typing.overload
     def _{{operationId}}_oapg(
-    {{> endpoint_args selfType="api_client.Api" }}
-        ...
+    {{> endpoint_args isOverload=true skipDeserialization="null"}}
 
     def _{{operationId}}_oapg(
-    {{> endpoint_args selfType="api_client.Api" }}
+    {{> endpoint_args isOverload=false skipDeserialization="null"}}
         """
     {{#if summary}}
         {{summary}}
@@ -548,19 +547,18 @@ class {{operationIdCamelCase}}(BaseApi):
 
     @typing.overload
     def {{operationId}}(
-    {{> endpoint_args_overload selfType="BaseApi" isSkip=false}}
+    {{> endpoint_args isOverload=true skipDeserialization="False"}}
 
     @typing.overload
     def {{operationId}}(
-    {{> endpoint_args_overload selfType="BaseApi" isSkip=true}}
+    {{> endpoint_args isOverload=true skipDeserialization="True"}}
 
     @typing.overload
     def {{operationId}}(
-    {{> endpoint_args selfType="BaseApi" }}
-        ...
+    {{> endpoint_args isOverload=true skipDeserialization="null"}}
 
     def {{operationId}}(
-    {{> endpoint_args selfType="BaseApi" }}
+    {{> endpoint_args isOverload=false skipDeserialization="null"}}
         return self._{{operationId}}_oapg(
             {{> endpoint_args_passed }}
         )
@@ -571,19 +569,18 @@ class ApiFor{{httpMethod}}(BaseApi):
 
     @typing.overload
     def {{httpMethod}}(
-    {{> endpoint_args_overload selfType="BaseApi" isSkip=false}}
+    {{> endpoint_args isOverload=true skipDeserialization="False"}}
 
     @typing.overload
     def {{httpMethod}}(
-    {{> endpoint_args_overload selfType="BaseApi" isSkip=true}}
+    {{> endpoint_args isOverload=true skipDeserialization="True"}}
 
     @typing.overload
     def {{httpMethod}}(
-    {{> endpoint_args selfType="BaseApi" }}
-        ...
+    {{> endpoint_args isOverload=true skipDeserialization="null"}}
 
     def {{httpMethod}}(
-    {{> endpoint_args selfType="BaseApi" }}
+    {{> endpoint_args isOverload=false skipDeserialization="null"}}
         return self._{{operationId}}_oapg(
             {{> endpoint_args_passed }}
         )

modules/openapi-json-schema-generator/src/main/resources/python/endpoint_args.handlebars

@@ -1,48 +1,87 @@
-    self: {{selfType}},
+    self,
 {{#if bodyParam}}
-{{#with bodyParam}}
-    body: typing.Union[{{#each content}}{{#with this.schema}}{{baseName}}, {{> model_templates/schema_python_types }}{{/with}}{{/each}}{{#unless required}}schemas.Unset] = schemas.unset{{else}}]{{/unless}},
-{{/with}}
+    {{#with bodyParam}}
+        {{#if isOverload}}
+    body: typing.Union[{{#each content}}{{#with this.schema}}{{baseName}},{{> model_templates/schema_python_types }}{{/with}}{{/each}}{{#unless required}}schemas.Unset] = schemas.unset{{else}}]{{/unless}},
+        {{else}}
+    body,
+        {{/if}}
+    {{/with}}
 {{/if}}
 {{#if queryParams}}
-    query_params: RequestQueryParams = frozendict.frozendict(),
+    query_params{{#if isOverload}}: RequestQueryParams{{/if}} = frozendict.frozendict(),
 {{/if}}
 {{#if headerParams}}
-    header_params: RequestHeaderParams = frozendict.frozendict(),
+    header_params{{#if isOverload}}: RequestHeaderParams{{/if}} = frozendict.frozendict(),
 {{/if}}
 {{#if pathParams}}
-    path_params: RequestPathParams = frozendict.frozendict(),
+    path_params{{#if isOverload}}: RequestPathParams{{/if}} = frozendict.frozendict(),
 {{/if}}
 {{#if cookieParams}}
-    cookie_params: RequestCookieParams = frozendict.frozendict(),
+    cookie_params{{#if isOverload}}: RequestCookieParams{{/if}} = frozendict.frozendict(),
 {{/if}}
 {{#with bodyParam}}
-{{#each content}}
-{{#if @first}}
-    content_type: str = '{{{@key}}}',
-{{/if}}
-{{/each}}
+    {{#each content}}
+        {{#if @first}}
+    content_type{{#if isOverload}}: str{{/if}} = '{{{@key}}}',
+        {{/if}}
+    {{/each}}
 {{/with}}
 {{#if produces}}
-    accept_content_types: typing.Tuple[str] = _all_accept_content_types,
+    accept_content_types{{#if isOverload}}: typing.Tuple[str]{{/if}} = _all_accept_content_types,
 {{/if}}
 {{#if servers}}
-    host_index: typing.Optional[int] = None,
+    host_index{{#if isOverload}}: typing.Optional[int]{{/if}} = None,
 {{/if}}
-    stream: bool = False,
-    timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
+    stream{{#if isOverload}}: bool{{/if}} = False,
+    timeout{{#if isOverload}}: typing.Optional[typing.Union[int, typing.Tuple]]{{/if}} = None,
+    {{#if isOverload}}
+        {{#eq skipDeserialization "True"}}
+    skip_deserialization: typing_extensions.Literal[True] = True,
+        {{/eq}}
+        {{#eq skipDeserialization "False"}}
+    skip_deserialization: typing_extensions.Literal[False] = False,
+        {{/eq}}
+        {{#eq skipDeserialization "null"}}
     skip_deserialization: bool = False,
+        {{/eq}}
+    {{else}}
+    skip_deserialization = False,
+    {{/if}}
+{{#eq skipDeserialization "True"}}
+) -> api_client.ApiResponseWithoutDeserialization:
+{{/eq}}
+{{#eq skipDeserialization "False"}}
 ) -> typing.Union[
-{{#each responses}}
-    {{#if isDefault}}
+    {{#each responses}}
+        {{#if isDefault}}
     ApiResponseForDefault,
-    {{else}}
-        {{#if is2xx}}
+        {{else}}
+            {{#if is2xx}}
     ApiResponseFor{{code}},
+            {{/if}}
         {{/if}}
+    {{/each}}
+]:
+{{/eq}}
+{{#eq skipDeserialization "null"}}
+    {{#if isOverload}}
+) -> typing.Union[
+        {{#each responses}}
+            {{#if isDefault}}
+    ApiResponseForDefault,
+            {{else}}
+                {{#if is2xx}}
+    ApiResponseFor{{code}},
+                {{/if}}
+            {{/if}}
+        {{/each}}
+    api_client.ApiResponseWithoutDeserialization,
+]:
     {{else}}
-    api_client.ApiResponse,
+):
     {{/if}}
-{{/each}}
-    api_client.ApiResponseWithoutDeserialization
-]:
+{{/eq}}
+{{#if isOverload}}
+    ...
+{{/if}}