Skip to content
This repository was archived by the owner on Dec 25, 2024. It is now read-only.

Commit 6cc5fc5

Browse files
spacetherspacether
committed
getitem templates refactored for list usage
1 parent 73cc063 commit 6cc5fc5

4 files changed

Lines changed: 22 additions & 16 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{{#if types}}
22
{{#eq types.size 1}}
3-
def __getitem__(self, name: {{#if key}}typing_extensions.Literal["{{{key.original}}}"]{{else}}str{{/if}}) -> Schema_{{propertyClass}}.{{jsonPathPiece.camelCase}}[{{> components/schemas/_helper_schema_python_base_types }}]:{{#if overload}} ...{{/if}}
3+
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}}
44
{{else}}
5-
def __getitem__(self, name: {{#if key}}typing_extensions.Literal["{{{key.original}}}"]{{else}}str{{/if}}) -> Schema_{{propertyClass}}.{{jsonPathPiece.camelCase}}[typing.Union[
5+
def __getitem__(self, name: {{#if literal}}typing_extensions.Literal["{{{key}}}"]{{else}}{{key}}{{/if}}) -> Schema_{{propertyClass}}.{{jsonPathPiece.camelCase}}[typing.Union[
66
{{> components/schemas/_helper_schema_python_base_types_newline }}
77
]]:{{#if overload}} ...{{/if}}
88
{{/eq}}
99
{{else}}
10-
def __getitem__(self, name: {{#if key}}typing_extensions.Literal["{{{key.original}}}"]{{else}}str{{/if}}) -> Schema_{{propertyClass}}.{{jsonPathPiece.camelCase}}[typing.Union[
10+
def __getitem__(self, name: {{#if literal}}typing_extensions.Literal["{{{key}}}"]{{else}}{{key}}{{/if}}) -> Schema_{{propertyClass}}.{{jsonPathPiece.camelCase}}[typing.Union[
1111
{{> components/schemas/_helper_schema_python_base_types_newline }}
1212
]]:{{#if overload}} ...{{/if}}
1313
{{/if}}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{{#with getDeepestRef}}
22
{{#if types}}
33
{{#eq types.size 1}}
4-
def __getitem__(self, name: {{#if key}}typing_extensions.Literal["{{{key.original}}}"]{{else}}str{{/if}}) -> {{#if ../refInfo.refModule}}{{../refInfo.refModule}}.{{/if}}{{../refInfo.refClass}}[{{> components/schemas/_helper_schema_python_base_types }}]:{{#if overload}} ...{{/if}}
4+
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}}
55
{{else}}
6-
def __getitem__(self, name: {{#if key}}typing_extensions.Literal["{{{key.original}}}"]{{else}}str{{/if}}) -> {{#if ../refInfo.refModule}}{{../refInfo.refModule}}.{{/if}}{{../refInfo.refClass}}[typing.Union[
6+
def __getitem__(self, name: {{#if literal}}typing_extensions.Literal["{{{key}}}"]{{else}}{{key}}{{/if}}) -> {{#if ../refInfo.refModule}}{{../refInfo.refModule}}.{{/if}}{{../refInfo.refClass}}[typing.Union[
77
{{> components/schemas/_helper_schema_python_base_types_newline }}
88
]]:{{#if overload}} ...{{/if}}
99
{{/eq}}
1010
{{else}}
11-
def __getitem__(self, name: {{#if key}}typing_extensions.Literal["{{{key.original}}}"]{{else}}str{{/if}}) -> {{#if ../refInfo.refModule}}{{../refInfo.refModule}}.{{/if}}{{../refInfo.refClass}}[typing.Union[
11+
def __getitem__(self, name: {{#if literal}}typing_extensions.Literal["{{{key}}}"]{{else}}{{key}}{{/if}}) -> {{#if ../refInfo.refModule}}{{../refInfo.refModule}}.{{/if}}{{../refInfo.refClass}}[typing.Union[
1212
{{> components/schemas/_helper_schema_python_base_types_newline }}
1313
]]:{{#if overload}} ...{{/if}}
1414
{{/if}}

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
@typing.overload
66
{{#if refInfo.refClass}}
7-
{{> components/schemas/_helper_getitem_refclass key=@key overload=true }}
7+
{{> components/schemas/_helper_getitem_refclass literal=true key=@key.original overload=true }}
88
{{else}}
99
{{#if jsonPathPiece}}
1010
{{#if schemaIsFromAdditionalProperties}}
11-
{{> components/schemas/_helper_getitem_property propertyClass="" key=@key overload=true }}
11+
{{> components/schemas/_helper_getitem_property propertyClass="" literal=true key=@key.original overload=true }}
1212
{{else}}
13-
{{> components/schemas/_helper_getitem_property propertyClass=".Properties" key=@key overload=true }}
13+
{{> components/schemas/_helper_getitem_property propertyClass=".Properties" literal=true key=@key.original overload=true }}
1414
{{/if}}
1515
{{else}}
1616
{{! for when additionalProperties is unset }}
@@ -27,9 +27,9 @@ def __getitem__(self, name: typing_extensions.Literal["{{{@key.original}}}"]) ->
2727

2828
@typing.overload
2929
{{#if refInfo.refClass}}
30-
{{> components/schemas/_helper_getitem_refclass key=@key overload=true }}
30+
{{> components/schemas/_helper_getitem_refclass literal=true key=@key.original overload=true }}
3131
{{else}}
32-
{{> components/schemas/_helper_getitem_property propertyClass=".Properties" key=@key overload=true }}
32+
{{> components/schemas/_helper_getitem_property propertyClass=".Properties" literal=true key=@key.original overload=true }}
3333
{{/if}}
3434
{{/each}}
3535
{{/if}}
@@ -39,9 +39,9 @@ def __getitem__(self, name: typing_extensions.Literal["{{{@key.original}}}"]) ->
3939

4040
@typing.overload
4141
{{#if refInfo.refClass}}
42-
{{> components/schemas/_helper_getitem_refclass key=null overload=true }}
42+
{{> components/schemas/_helper_getitem_refclass literal=false key="str" overload=true }}
4343
{{else}}
44-
{{> components/schemas/_helper_getitem_property propertyClass="" key=null overload=true }}
44+
{{> components/schemas/_helper_getitem_property propertyClass="" literal=false key="str" overload=true }}
4545
{{/if}}
4646
{{/unless}}
4747
{{else}}
@@ -87,9 +87,9 @@ def __getitem__(
8787
{{#unless isBooleanSchemaFalse}}
8888

8989
{{#if refInfo.refClass}}
90-
{{> components/schemas/_helper_getitem_refclass key=null overload=false }}
90+
{{> components/schemas/_helper_getitem_refclass literal=false key="str" overload=false }}
9191
{{else}}
92-
{{> components/schemas/_helper_getitem_property propertyClass="" key=null overload=false }}
92+
{{> components/schemas/_helper_getitem_property propertyClass="" literal=false key="str" overload=false }}
9393
{{/if}}
9494
# dict_instance[name] accessor
9595
return super().__getitem__(name)

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,11 @@ class {{jsonPathPiece.camelCase}}(
2727

2828
{{> components/schemas/_helper_new }}
2929

30-
def __getitem__(self, i: int) -> {{#with items}}{{#if refInfo.refClass}}'{{> components/schemas/_helper_refclass_with_module }}'{{else}}Schema_.{{jsonPathPiece.camelCase}}{{/if}}{{/with}}:
30+
{{#with items}}
31+
{{#if refInfo.refClass}}
32+
def __getitem__(self, i: int) -> '{{> components/schemas/_helper_refclass_with_module }}':
33+
{{else}}
34+
def __getitem__(self, i: int) -> Schema_.{{jsonPathPiece.camelCase}}:
35+
{{/if}}
3136
return super().__getitem__(i)
37+
{{/with}}

0 commit comments

Comments
 (0)