Adds content info to parameters

spacether · spacether · commit bd2894cab9d3 · 2022-10-07T09:35:32.000-07:00
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/endpoint_parameter.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/endpoint_parameter.handlebars
@@ -4,9 +4,16 @@ request_{{#if isQueryParam}}query{{/if}}{{#if isPathParam}}path{{/if}}{{#if isHe
     style=api_client.ParameterStyle.{{style}},
 {{/if}}
 {{#if schema}}
-{{#with schema}}
+    {{#with schema}}
     schema={{baseName}},
-{{/with}}
+    {{/with}}
+{{/if}}
+{{#if getContent}}
+    content={
+{{#each getContent}}
+        "{{@key}}": {{#with this}}{{#with schema}}{{baseName}}{{/with}}{{/with}},
+{{/each}}
+    },
 {{/if}}
 {{#if required}}
     required=True,
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/endpoint_parameter_schema_and_def.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/endpoint_parameter_schema_and_def.handlebars
@@ -1,15 +1,31 @@
 # {{xParamsName}} params
 {{#each xParams}}
-{{#with schema}}
+    {{#if schema}}
+        {{#with schema}}
 {{> model_templates/schema }}
-{{/with}}
+        {{/with}}
+    {{else}}
+        {{#if getContent}}
+            {{#each getContent}}
+                {{#with this}}
+                    {{#with schema}}
+{{> model_templates/schema }}
+                    {{/with}}
+                {{/with}}
+            {{/each}}
+        {{/if}}
+    {{/if}}
 {{/each}}
 RequestRequired{{xParamsName}}Params = typing_extensions.TypedDict(
     'RequestRequired{{xParamsName}}Params',
     {
 {{#each xParams}}
 {{#if required}}
+{{#if schema}}
         '{{baseName}}': {{#with schema}}typing.Union[{{baseName}}, {{> model_templates/schema_python_types }}],{{/with}}
+{{else}}
+        '{{baseName}}': {{#each getContent}}{{#with this}}{{#with schema}}typing.Union[{{baseName}}, {{> model_templates/schema_python_types }}],{{/with}}{{/with}}{{/each}}
+{{/if}}
 {{/if}}
 {{/each}}
     }
@@ -19,7 +35,11 @@ RequestOptional{{xParamsName}}Params = typing_extensions.TypedDict(
     {
 {{#each xParams}}
 {{#unless required}}
+{{#if schema}}
         '{{baseName}}': {{#with schema}}typing.Union[{{baseName}}, {{> model_templates/schema_python_types }}],{{/with}}
+{{else}}
+        '{{baseName}}': {{#each getContent}}{{#with this}}{{#with schema}}typing.Union[{{baseName}}, {{> model_templates/schema_python_types }}],{{/with}}{{/with}}{{/each}}
+{{/if}}
 {{/unless}}
 {{/each}}
     },
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_query_param_with_json_content_type/get.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_query_param_with_json_content_type/get.py
@@ -28,10 +28,11 @@
 from . import path
 
 # Query params
+SchemaForRequestParameterSomeParamApplicationJson = schemas.AnyTypeSchema
 RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
-        'someParam': 
+        'someParam': typing.Union[SchemaForRequestParameterSomeParamApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
     }
 )
 RequestOptionalQueryParams = typing_extensions.TypedDict(
@@ -48,6 +49,9 @@ class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams)
 
 request_query_some_param = api_client.QueryParameter(
     name="someParam",
+    content={
+        "application/json": SchemaForRequestParameterSomeParamApplicationJson,
+    },
     required=True,
 )
 SchemaFor200ResponseBodyApplicationJson = schemas.AnyTypeSchema
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_query_param_with_json_content_type/get.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_query_param_with_json_content_type/get.pyi
@@ -26,10 +26,11 @@ import frozendict  # noqa: F401
 from petstore_api import schemas  # noqa: F401
 
 # Query params
+SchemaForRequestParameterSomeParamApplicationJson = schemas.AnyTypeSchema
 RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
-        'someParam': 
+        'someParam': typing.Union[SchemaForRequestParameterSomeParamApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
     }
 )
 RequestOptionalQueryParams = typing_extensions.TypedDict(
@@ -46,6 +47,9 @@ class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams)
 
 request_query_some_param = api_client.QueryParameter(
     name="someParam",
+    content={
+        "application/json": SchemaForRequestParameterSomeParamApplicationJson,
+    },
     required=True,
 )
 SchemaFor200ResponseBodyApplicationJson = schemas.AnyTypeSchema

Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,11 @@`
`28`	`28`	`from . import path`
`29`	`29`
`30`	`30`	`# Query params`
	`31`	`+SchemaForRequestParameterSomeParamApplicationJson = schemas.AnyTypeSchema`
`31`	`32`	`RequestRequiredQueryParams = typing_extensions.TypedDict(`
`32`	`33`	`'RequestRequiredQueryParams',`
`33`	`34`	`{`
`34`		`- 'someParam':`
	`35`	`+ 'someParam': typing.Union[SchemaForRequestParameterSomeParamApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],`
`35`	`36`	`}`
`36`	`37`	`)`
`37`	`38`	`RequestOptionalQueryParams = typing_extensions.TypedDict(`
`@@ -48,6 +49,9 @@ class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams)`
`48`	`49`
`49`	`50`	`request_query_some_param = api_client.QueryParameter(`
`50`	`51`	`name="someParam",`
	`52`	`+ content={`
	`53`	`+ "application/json": SchemaForRequestParameterSomeParamApplicationJson,`
	`54`	`+ },`
`51`	`55`	`required=True,`
`52`	`56`	`)`
`53`	`57`	`SchemaFor200ResponseBodyApplicationJson = schemas.AnyTypeSchema`
Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,11 @@ import frozendict # noqa: F401`
`26`	`26`	`from petstore_api import schemas # noqa: F401`
`27`	`27`
`28`	`28`	`# Query params`
	`29`	`+SchemaForRequestParameterSomeParamApplicationJson = schemas.AnyTypeSchema`
`29`	`30`	`RequestRequiredQueryParams = typing_extensions.TypedDict(`
`30`	`31`	`'RequestRequiredQueryParams',`
`31`	`32`	`{`
`32`		`- 'someParam':`
	`33`	`+ 'someParam': typing.Union[SchemaForRequestParameterSomeParamApplicationJson, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],`
`33`	`34`	`}`
`34`	`35`	`)`
`35`	`36`	`RequestOptionalQueryParams = typing_extensions.TypedDict(`
`@@ -46,6 +47,9 @@ class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams)`
`46`	`47`
`47`	`48`	`request_query_some_param = api_client.QueryParameter(`
`48`	`49`	`name="someParam",`
	`50`	`+ content={`
	`51`	`+ "application/json": SchemaForRequestParameterSomeParamApplicationJson,`
	`52`	`+ },`
`49`	`53`	`required=True,`
`50`	`54`	`)`
`51`	`55`	`SchemaFor200ResponseBodyApplicationJson = schemas.AnyTypeSchema`