v3 adds generic type info to schema classes/properties/items

modules/openapi-json-schema-generator/src/main/resources/python/api_client.hbs

@@ -782,7 +782,7 @@ class OpenApiResponse(JSONDetector, TypedDictInputVerifier, typing.Generic[T]):
     __filename_content_disposition_pattern = re.compile('filename="(.+?)"')
     response_cls: typing.Type[T]
     content: typing.Optional[typing.Dict[str, MediaType]] = None
-    headers: typing.Optional[typing.Dict[str, HeaderParameterWithoutName]] = None
+    headers: typing.Optional[typing.Dict[str, typing.Type[HeaderParameterWithoutName]]] = None
 
     @staticmethod
     def __deserialize_json(response: urllib3.HTTPResponse) -> typing.Any:
@@ -1367,12 +1367,13 @@ class RequestBody(StyleFormSerializer, JSONDetector):
         - encode_multipart and fields for multipart/form-data
         """
         media_type = cls.content[content_type]
-        if isinstance(in_data, media_type.schema):
+        schema = schemas._get_class(media_type.schema)
+        if isinstance(in_data, schema):
             cast_in_data = in_data
         elif isinstance(in_data, (dict, frozendict.frozendict)) and in_data:
-            cast_in_data = media_type.schema(**in_data)
+            cast_in_data = schema(**in_data)
         else:
-            cast_in_data = media_type.schema(in_data)
+            cast_in_data = schema(in_data)
         # TODO check for and use encoding if it exists
         # and content_type is multipart or application/x-www-form-urlencoded
         if cls._content_type_is_json(content_type):

modules/openapi-json-schema-generator/src/main/resources/python/components/_helper_content_schema_type.hbs

@@ -0,0 +1,31 @@
+{{#if refInfo.refClass}}
+    {{#with getDeepestRef}}
+        {{#if types}}
+            {{#eq types.size 1}}
+{{#if paramName}}{{paramName}}: {{#eq paramName "schema"}}typing_extensions.TypeAlias = {{/eq}}{{/if}}{{#if modulePrefix}}{{modulePrefix}}_{{/if}}{{../jsonPathPiece.snakeCase}}.{{../jsonPathPiece.camelCase}}[{{> components/schemas/_helper_schema_python_base_types }}]{{#unless paramName}},{{/unless}}
+            {{else}}
+{{#if paramName}}{{paramName}}: {{#eq paramName "schema"}}typing_extensions.TypeAlias = {{/eq}}{{/if}}{{#if modulePrefix}}{{modulePrefix}}_{{/if}}{{../jsonPathPiece.snakeCase}}.{{../jsonPathPiece.camelCase}}[typing.Union[
+    {{> components/schemas/_helper_schema_python_base_types_newline }}
+]]{{#unless paramName}},{{/unless}}
+            {{/eq}}
+        {{else}}
+{{#if paramName}}{{paramName}}: {{#eq paramName "schema"}}typing_extensions.TypeAlias = {{/eq}}{{/if}}{{#if modulePrefix}}{{modulePrefix}}_{{/if}}{{../jsonPathPiece.snakeCase}}.{{../jsonPathPiece.camelCase}}[typing.Union[
+    {{> components/schemas/_helper_schema_python_base_types_newline }}
+]]{{#unless paramName}},{{/unless}}
+        {{/if}}
+    {{/with}}
+{{else}}
+    {{#if types}}
+        {{#eq types.size 1}}
+{{#if paramName}}{{paramName}}: {{#eq paramName "schema"}}typing_extensions.TypeAlias = {{/eq}}{{/if}}{{#if modulePrefix}}{{modulePrefix}}_{{/if}}{{jsonPathPiece.snakeCase}}.{{jsonPathPiece.camelCase}}[{{> components/schemas/_helper_schema_python_base_types }}]{{#unless paramName}},{{/unless}}
+        {{else}}
+{{#if includeBody}}{{paramName}}: {{#eq paramName "schema"}}typing_extensions.TypeAlias = {{/eq}}{{/if}}{{#if modulePrefix}}{{modulePrefix}}_{{/if}}{{jsonPathPiece.snakeCase}}.{{jsonPathPiece.camelCase}}[typing.Union[
+    {{> components/schemas/_helper_schema_python_base_types_newline }}
+]]{{#unless paramName}},{{/unless}}
+        {{/eq}}
+    {{else}}
+{{#if paramName}}{{paramName}}: {{#eq paramName "schema"}}typing_extensions.TypeAlias = {{/eq}}{{/if}}{{#if modulePrefix}}{{modulePrefix}}_{{/if}}{{jsonPathPiece.snakeCase}}.{{jsonPathPiece.camelCase}}[typing.Union[
+    {{> components/schemas/_helper_schema_python_base_types_newline }}
+]]{{#unless paramName}},{{/unless}}
+    {{/if}}
+{{/if}}

modules/openapi-json-schema-generator/src/main/resources/python/components/_helper_param_or_header_instance.hbs

@@ -27,31 +27,31 @@ class {{jsonPathPiece.camelCase}}(api_client.{{#if noName}}Header{{/if}}{{#eq in
 {{/if}}
 {{#if schema}}
     {{#with schema}}
-    schema = {{jsonPathPiece.snakeCase}}.{{jsonPathPiece.camelCase}}
+    {{> components/_helper_content_schema_type paramName="schema" modulePrefix=null }}
     {{/with}}
 {{/if}}
 {{#if content}}
 {{#each content}}
 
 
-    class __{{@key.camelCase}}MediaType(api_client.MediaType):
+    class {{@key.camelCase}}MediaType(api_client.MediaType):
     {{#with this}}
         {{#with schema}}
-        schema: typing.Type[{{../@key.snakeCase}}_{{jsonPathPiece.snakeCase}}.{{jsonPathPiece.camelCase}}] = {{../@key.snakeCase}}_{{jsonPathPiece.snakeCase}}.{{jsonPathPiece.camelCase}}
+        {{> components/_helper_content_schema_type paramName="schema" modulePrefix=../@key.snakeCase }}
         {{/with}}
     {{/with}}
 {{/each}}
-    __Content = typing_extensions.TypedDict(
-        '__Content',
+    Content = typing_extensions.TypedDict(
+        'Content',
         {
 {{#each content}}
-            '{{{@key.original}}}': typing.Type[__{{@key.camelCase}}MediaType],
+            '{{{@key.original}}}': typing.Type[{{@key.camelCase}}MediaType],
 {{/each}}
         }
     )
-    content: __Content = {
+    content: Content = {
 {{#each content}}
-        '{{{@key.original}}}': __{{@key.camelCase}}MediaType,
+        '{{{@key.original}}}': {{@key.camelCase}}MediaType,
 {{/each}}
     }
 {{/if}}

modules/openapi-json-schema-generator/src/main/resources/python/components/request_bodies/request_body.hbs

@@ -24,24 +24,24 @@ class {{jsonPathPiece.camelCase}}(api_client.RequestBody):
     {{#each content}}
 
 
-    class __{{@key.camelCase}}MediaType(api_client.MediaType):
+    class {{@key.camelCase}}MediaType(api_client.MediaType):
         {{#with this}}
             {{#with schema}}
         schema: typing.Type[{{../@key.snakeCase}}_{{jsonPathPiece.snakeCase}}.{{jsonPathPiece.camelCase}}] = {{../@key.snakeCase}}_{{jsonPathPiece.snakeCase}}.{{jsonPathPiece.camelCase}}
             {{/with}}
         {{/with}}
     {{/each}}
-    __Content = typing_extensions.TypedDict(
-        '__Content',
+    Content = typing_extensions.TypedDict(
+        'Content',
         {
     {{#each content}}
-            '{{{@key.original}}}': typing.Type[__{{@key.camelCase}}MediaType],
+            '{{{@key.original}}}': typing.Type[{{@key.camelCase}}MediaType],
     {{/each}}
         }
     )
-    content: __Content = {
+    content: Content = {
     {{#each content}}
-        '{{{@key.original}}}': __{{@key.camelCase}}MediaType,
+        '{{{@key.original}}}': {{@key.camelCase}}MediaType,
     {{/each}}
     }
     {{#if required}}

modules/openapi-json-schema-generator/src/main/resources/python/components/responses/_helper_header_schema_and_def.hbs

@@ -24,8 +24,8 @@ class {{xParamsName}}:
         pass
 
 
-    parameters = [
+    parameters: typing.Dict[str, typing.Type[api_client.HeaderParameterWithoutName]] = {
     {{#each xParams}}
-        {{jsonPathPiece.snakeCase}}.{{jsonPathPiece.camelCase}},
+        '{{@key}}': {{jsonPathPiece.snakeCase}}.{{jsonPathPiece.camelCase}},
     {{/each}}
-    ]
+    }

modules/openapi-json-schema-generator/src/main/resources/python/components/responses/response.hbs

@@ -40,15 +40,23 @@ class Api{{jsonPathPiece.camelCase}}(api_client.ApiResponse):
                 {{#each content}}
                     {{#if this.schema}}
                         {{#with this.schema}}
-        {{../@key.snakeCase}}_{{jsonPathPiece.snakeCase}}.{{jsonPathPiece.camelCase}},
+        {{> components/_helper_content_schema_type paramName=null modulePrefix=../@key.snakeCase }}
                         {{/with}}
                     {{else}}
         schemas.Unset,
                     {{/if}}
                 {{/each}}
     ]
             {{else}}
-    body: {{#each content}}{{#if this.schema}}{{#with this.schema}}{{../@key.snakeCase}}_{{jsonPathPiece.snakeCase}}.{{jsonPathPiece.camelCase}}{{/with}}{{else}}schemas.Unset{{/if}}{{/each}}
+                {{#each content}}
+                    {{#if this.schema}}
+                        {{#with this.schema}}
+    {{> components/_helper_content_schema_type paramName="body" modulePrefix=../@key.snakeCase }}
+                        {{/with}}
+                    {{else}}
+    body: schemas.Unset
+                    {{/if}}
+                {{/each}}
             {{/gt}}
         {{else}}
     body: schemas.Unset = schemas.unset
@@ -66,15 +74,23 @@ class Api{{jsonPathPiece.camelCase}}(api_client.ApiResponse):
                         {{#each content}}
                             {{#if this.schema}}
                                 {{#with this.schema}}
-        {{../@key.snakeCase}}_{{jsonPathPiece.snakeCase}}.{{jsonPathPiece.camelCase}},
-                            {{/with}}
-                        {{else}}
+        {{> components/_helper_content_schema_type paramName=null modulePrefix=../@key.snakeCase }}
+                                {{/with}}
+                            {{else}}
         schemas.Unset,
                             {{/if}}
                         {{/each}}
     ]
                     {{else}}
-    body: {{#each content}}{{#if this.schema}}{{#with this.schema}}{{../@key.snakeCase}}_{{jsonPathPiece.snakeCase}}.{{jsonPathPiece.camelCase}}{{/with}}{{else}}schemas.Unset{{/if}}{{/each}}
+                        {{#each content}}
+                            {{#if this.schema}}
+                                {{#with this.schema}}
+    {{> components/_helper_content_schema_type paramName="body" modulePrefix=../@key.snakeCase }}
+                                {{/with}}
+                            {{else}}
+    body: schemas.Unset
+                            {{/if}}
+                        {{/each}}
                     {{/gt}}
                 {{else}}
     body: schemas.Unset = schemas.unset
@@ -96,27 +112,27 @@ class {{jsonPathPiece.camelCase}}(api_client.OpenApiResponse[Api{{jsonPathPiece.
     {{#each content}}
 
 
-    class __{{@key.camelCase}}MediaType(api_client.MediaType):
+    class {{@key.camelCase}}MediaType(api_client.MediaType):
         {{#with this}}
             {{#with schema}}
-        schema: typing.Type[{{../@key.snakeCase}}_{{jsonPathPiece.snakeCase}}.{{jsonPathPiece.camelCase}}] = {{../@key.snakeCase}}_{{jsonPathPiece.snakeCase}}.{{jsonPathPiece.camelCase}}
+        {{> components/_helper_content_schema_type paramName="schema" modulePrefix=../@key.snakeCase }}
             {{else}}
         pass
             {{/with}}
         {{/with}}
     {{/each}}
     {{#if content}}
-    __Content = typing_extensions.TypedDict(
-        '__Content',
+    Content = typing_extensions.TypedDict(
+        'Content',
         {
         {{#each content}}
-            '{{{@key.original}}}': typing.Type[__{{@key.camelCase}}MediaType],
+            '{{{@key.original}}}': typing.Type[{{@key.camelCase}}MediaType],
         {{/each}}
         }
     )
-    content: __Content = {
+    content: Content = {
         {{#each content}}
-        '{{{@key.original}}}': __{{@key.camelCase}}MediaType,
+        '{{{@key.original}}}': {{@key.camelCase}}MediaType,
         {{/each}}
     }
     {{/if}}

modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_getitem_property.hbs

@@ -0,0 +1,13 @@
+{{#if types}}
+    {{#eq types.size 1}}
+def __getitem__(self, name: {{#if literal}}typing_extensions.Literal["{{{key}}}"]{{else}}{{key}}{{/if}}) -> Schema_{{propertyClass}}.{{jsonPathPiece.camelCase}}[{{> components/schemas/_helper_schema_python_base_types }}]:{{#if overload}} ...{{/if}}
+    {{else}}
+def __getitem__(self, name: {{#if literal}}typing_extensions.Literal["{{{key}}}"]{{else}}{{key}}{{/if}}) -> Schema_{{propertyClass}}.{{jsonPathPiece.camelCase}}[typing.Union[
+    {{> components/schemas/_helper_schema_python_base_types_newline }}
+]]:{{#if overload}} ...{{/if}}
+    {{/eq}}
+{{else}}
+def __getitem__(self, name: {{#if literal}}typing_extensions.Literal["{{{key}}}"]{{else}}{{key}}{{/if}}) -> Schema_{{propertyClass}}.{{jsonPathPiece.camelCase}}[typing.Union[
+    {{> components/schemas/_helper_schema_python_base_types_newline }}
+]]:{{#if overload}} ...{{/if}}
+{{/if}}

modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_getitem_refclass.hbs

@@ -0,0 +1,15 @@
+{{#with getDeepestRef}}
+    {{#if types}}
+        {{#eq types.size 1}}
+def __getitem__(self, name: {{#if literal}}typing_extensions.Literal["{{{key}}}"]{{else}}{{key}}{{/if}}) -> {{#if ../refInfo.refModule}}{{../refInfo.refModule}}.{{/if}}{{../refInfo.refClass}}[{{> components/schemas/_helper_schema_python_base_types }}]:{{#if overload}} ...{{/if}}
+        {{else}}
+def __getitem__(self, name: {{#if literal}}typing_extensions.Literal["{{{key}}}"]{{else}}{{key}}{{/if}}) -> {{#if ../refInfo.refModule}}{{../refInfo.refModule}}.{{/if}}{{../refInfo.refClass}}[typing.Union[
+    {{> components/schemas/_helper_schema_python_base_types_newline }}
+]]:{{#if overload}} ...{{/if}}
+        {{/eq}}
+    {{else}}
+def __getitem__(self, name: {{#if literal}}typing_extensions.Literal["{{{key}}}"]{{else}}{{key}}{{/if}}) -> {{#if ../refInfo.refModule}}{{../refInfo.refModule}}.{{/if}}{{../refInfo.refClass}}[typing.Union[
+    {{> components/schemas/_helper_schema_python_base_types_newline }}
+]]:{{#if overload}} ...{{/if}}
+    {{/if}}
+{{/with}}

modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_getitems.hbs

@@ -4,51 +4,94 @@
 
 @typing.overload
 {{#if refInfo.refClass}}
-def __getitem__(self, name: typing_extensions.Literal["{{{@key.original}}}"]) -> '{{> components/schemas/_helper_refclass_with_module }}': ...
+{{> components/schemas/_helper_getitem_refclass literal=true key=@key.original overload=true }}
 {{else}}
     {{#if jsonPathPiece}}
         {{#if schemaIsFromAdditionalProperties}}
-def __getitem__(self, name: typing_extensions.Literal["{{{@key.original}}}"]) -> Schema_.{{jsonPathPiece.camelCase}}: ...
+{{> components/schemas/_helper_getitem_property propertyClass="" literal=true key=@key.original overload=true }}
         {{else}}
-def __getitem__(self, name: typing_extensions.Literal["{{{@key.original}}}"]) -> Schema_.Properties.{{jsonPathPiece.camelCase}}: ...
+{{> components/schemas/_helper_getitem_property propertyClass=".Properties" literal=true key=@key.original overload=true }}
         {{/if}}
     {{else}}
-def __getitem__(self, name: typing_extensions.Literal["{{{@key.original}}}"]) -> schemas.AnyTypeSchema: ...
+        {{! for when additionalProperties is unset, use schemas.AnyTypeSchema because val is not always schemas.UnsetAnyTypeSchema }}
+def __getitem__(self, name: typing_extensions.Literal["{{{@key.original}}}"]) -> schemas.AnyTypeSchema[typing.Union[
+    {{> components/schemas/_helper_schema_python_base_types_newline }}
+]]: ...
     {{/if}}
 {{/if}}
 {{/with}}
 {{/each}}
 {{/if}}
 {{#if optionalProperties}}
-{{#each optionalProperties}}
+    {{#each optionalProperties}}
 
 @typing.overload
-{{#if refInfo.refClass}}
-def __getitem__(self, name: typing_extensions.Literal["{{{@key.original}}}"]) -> '{{> components/schemas/_helper_refclass_with_module }}': ...
-{{else}}
-def __getitem__(self, name: typing_extensions.Literal["{{{@key.original}}}"]) -> Schema_.Properties.{{jsonPathPiece.camelCase}}: ...
-{{/if}}
-{{/each}}
+        {{#if refInfo.refClass}}
+{{> components/schemas/_helper_getitem_refclass literal=true key=@key.original overload=true }}
+        {{else}}
+{{> components/schemas/_helper_getitem_property propertyClass=".Properties" literal=true key=@key.original overload=true }}
+        {{/if}}
+    {{/each}}
 {{/if}}
 {{#or properties requiredProperties}}
     {{#with additionalProperties}}
         {{#unless isBooleanSchemaFalse}}
 
 @typing.overload
-def __getitem__(self, name: str) -> {{#if refInfo.refClass}}'{{> components/schemas/_helper_refclass_with_module }}'{{else}}Schema_.{{jsonPathPiece.camelCase}}{{/if}}: ...
+            {{#if refInfo.refClass}}
+{{> components/schemas/_helper_getitem_refclass literal=false key="str" overload=true }}
+            {{else}}
+{{> components/schemas/_helper_getitem_property propertyClass="" literal=false key="str" overload=true }}
+            {{/if}}
         {{/unless}}
     {{else}}
+        {{! for when additionalProperties is unset, use schemas.AnyTypeSchema because val is not always schemas.UnsetAnyTypeSchema }}
 
 @typing.overload
-def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
+def __getitem__(self, name: str) -> schemas.AnyTypeSchema[typing.Union[
+    frozendict.frozendict,
+    str,
+    decimal.Decimal,
+    schemas.BoolClass,
+    schemas.NoneClass,
+    tuple,
+    bytes,
+    schemas.FileIO
+]]: ...
     {{/with}}
 
-{{> components/schemas/_helper_getitem methodName="__getitem__" }}
+def __getitem__(
+    self,
+    name: typing.Union[
+    {{#each requiredProperties}}
+        {{#if this}}
+        typing_extensions.Literal["{{{@key.original}}}"],
+        {{/if}}
+    {{/each}}
+    {{#each optionalProperties}}
+        typing_extensions.Literal["{{{@key.original}}}"],
+    {{/each}}
+    {{#with additionalProperties}}
+        {{#unless isBooleanSchemaFalse}}
+        str
+        {{/unless}}
+    {{else}}
+        str
+    {{/with}}
+    ]
+):
+    # dict_instance[name] accessor
+    return super().__getitem__(name)
 {{else}}
+    {{! no properties or requiredProperties }}
     {{#with additionalProperties}}
         {{#unless isBooleanSchemaFalse}}
 
-def __getitem__(self, name: str) -> {{#if refInfo.refClass}}'{{> components/schemas/_helper_refclass_with_module }}'{{else}}Schema_.{{jsonPathPiece.camelCase}}{{/if}}:
+            {{#if refInfo.refClass}}
+{{> components/schemas/_helper_getitem_refclass literal=false key="str" overload=false }}
+            {{else}}
+{{> components/schemas/_helper_getitem_property propertyClass="" literal=false key="str" overload=false }}
+            {{/if}}
     # dict_instance[name] accessor
     return super().__getitem__(name)
         {{/unless}}