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

Commit cb04efb

Browse files
spacetherspacether
authored
Issue 69 fix allow arg and args properties (#71)
* Template updates * Adds new component to spec * Samples regenerated * Adds manual test * Adds newline back to template, regens samples
1 parent 84557a9 commit cb04efb

File tree

454 files changed

+1945
-1658
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

454 files changed

+1945
-1658
lines changed

‎modules/openapi-json-schema-generator/src/main/resources/python/model_templates/new.handlebars

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
def __new__(
22
cls,
33
{{#if getHasMultipleTypes}}
4-
*args: typing.Union[{{> model_templates/schema_python_types }}],
4+
*_args: typing.Union[{{> model_templates/schema_python_types }}],
55
{{else}}
66
{{#if isArray }}
7-
arg: typing.Union[typing.Tuple[{{#with items}}{{#if complexType}}'{{complexType}}'{{else}}typing.Union[MetaOapg.{{baseName}}, {{> model_templates/schema_python_types }}]{{/if}}{{/with}}], typing.List[{{#with items}}{{#if complexType}}'{{complexType}}'{{else}}typing.Union[MetaOapg.{{baseName}}, {{> model_templates/schema_python_types }}]{{/if}}{{/with}}]],
7+
_arg: typing.Union[typing.Tuple[{{#with items}}{{#if complexType}}'{{complexType}}'{{else}}typing.Union[MetaOapg.{{baseName}}, {{> model_templates/schema_python_types }}]{{/if}}{{/with}}], typing.List[{{#with items}}{{#if complexType}}'{{complexType}}'{{else}}typing.Union[MetaOapg.{{baseName}}, {{> model_templates/schema_python_types }}]{{/if}}{{/with}}]],
88
{{else}}
9-
*args: typing.Union[{{> model_templates/schema_python_types }}],
9+
*_args: typing.Union[{{> model_templates/schema_python_types }}],
1010
{{/if}}
1111
{{/if}}
1212
{{#unless isNull}}
@@ -61,12 +61,12 @@ def __new__(
6161
return super().__new__(
6262
cls,
6363
{{#if getHasMultipleTypes}}
64-
*args,
64+
*_args,
6565
{{else}}
6666
{{#if isArray }}
67-
arg,
67+
_arg,
6868
{{else}}
69-
*args,
69+
*_args,
7070
{{/if}}
7171
{{/if}}
7272
{{#unless isNull}}

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

Lines changed: 68 additions & 68 deletions
Large diffs are not rendered by default.

‎modules/openapi-json-schema-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2038,6 +2038,16 @@ components:
20382038
- (xyz)
20392039
- COUNT_1M
20402040
- COUNT_50M
2041+
ObjectModelWithArgAndArgsProperties:
2042+
type: object
2043+
properties:
2044+
arg:
2045+
type: string
2046+
args:
2047+
type: string
2048+
required:
2049+
- arg
2050+
- args
20412051
Enum_Test:
20422052
type: object
20432053
required:

‎samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/model/additionalproperties_allows_a_schema_which_should_validate.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo"], typ
7171

7272
def __new__(
7373
cls,
74-
*args: typing.Union[dict, frozendict.frozendict, ],
74+
*_args: typing.Union[dict, frozendict.frozendict, ],
7575
foo: typing.Union[MetaOapg.properties.foo, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
7676
bar: typing.Union[MetaOapg.properties.bar, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
7777
_configuration: typing.Optional[schemas.Configuration] = None,
7878
**kwargs: typing.Union[MetaOapg.additional_properties, bool, ],
7979
) -> 'AdditionalpropertiesAllowsASchemaWhichShouldValidate':
8080
return super().__new__(
8181
cls,
82-
*args,
82+
*_args,
8383
foo=foo,
8484
bar=bar,
8585
_configuration=_configuration,

‎samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/model/additionalproperties_allows_a_schema_which_should_validate.pyi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ class AdditionalpropertiesAllowsASchemaWhichShouldValidate(
7171

7272
def __new__(
7373
cls,
74-
*args: typing.Union[dict, frozendict.frozendict, ],
74+
*_args: typing.Union[dict, frozendict.frozendict, ],
7575
foo: typing.Union[MetaOapg.properties.foo, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
7676
bar: typing.Union[MetaOapg.properties.bar, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
7777
_configuration: typing.Optional[schemas.Configuration] = None,
7878
**kwargs: typing.Union[MetaOapg.additional_properties, bool, ],
7979
) -> 'AdditionalpropertiesAllowsASchemaWhichShouldValidate':
8080
return super().__new__(
8181
cls,
82-
*args,
82+
*_args,
8383
foo=foo,
8484
bar=bar,
8585
_configuration=_configuration,

‎samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/model/additionalproperties_are_allowed_by_default.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,15 @@ def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", "bar
7373

7474
def __new__(
7575
cls,
76-
*args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
76+
*_args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
7777
foo: typing.Union[MetaOapg.properties.foo, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
7878
bar: typing.Union[MetaOapg.properties.bar, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
7979
_configuration: typing.Optional[schemas.Configuration] = None,
8080
**kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
8181
) -> 'AdditionalpropertiesAreAllowedByDefault':
8282
return super().__new__(
8383
cls,
84-
*args,
84+
*_args,
8585
foo=foo,
8686
bar=bar,
8787
_configuration=_configuration,

‎samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/model/additionalproperties_are_allowed_by_default.pyi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,15 @@ class AdditionalpropertiesAreAllowedByDefault(
7373

7474
def __new__(
7575
cls,
76-
*args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
76+
*_args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
7777
foo: typing.Union[MetaOapg.properties.foo, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
7878
bar: typing.Union[MetaOapg.properties.bar, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
7979
_configuration: typing.Optional[schemas.Configuration] = None,
8080
**kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
8181
) -> 'AdditionalpropertiesAreAllowedByDefault':
8282
return super().__new__(
8383
cls,
84-
*args,
84+
*_args,
8585
foo=foo,
8686
bar=bar,
8787
_configuration=_configuration,

‎samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/model/additionalproperties_can_exist_by_itself.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_proper
4545

4646
def __new__(
4747
cls,
48-
*args: typing.Union[dict, frozendict.frozendict, ],
48+
*_args: typing.Union[dict, frozendict.frozendict, ],
4949
_configuration: typing.Optional[schemas.Configuration] = None,
5050
**kwargs: typing.Union[MetaOapg.additional_properties, bool, ],
5151
) -> 'AdditionalpropertiesCanExistByItself':
5252
return super().__new__(
5353
cls,
54-
*args,
54+
*_args,
5555
_configuration=_configuration,
5656
**kwargs,
5757
)

‎samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/model/additionalproperties_can_exist_by_itself.pyi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ class AdditionalpropertiesCanExistByItself(
4545

4646
def __new__(
4747
cls,
48-
*args: typing.Union[dict, frozendict.frozendict, ],
48+
*_args: typing.Union[dict, frozendict.frozendict, ],
4949
_configuration: typing.Optional[schemas.Configuration] = None,
5050
**kwargs: typing.Union[MetaOapg.additional_properties, bool, ],
5151
) -> 'AdditionalpropertiesCanExistByItself':
5252
return super().__new__(
5353
cls,
54-
*args,
54+
*_args,
5555
_configuration=_configuration,
5656
**kwargs,
5757
)

‎samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/model/additionalproperties_should_not_look_in_applicators.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", ], s
7474

7575
def __new__(
7676
cls,
77-
*args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
77+
*_args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
7878
foo: typing.Union[MetaOapg.properties.foo, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
7979
_configuration: typing.Optional[schemas.Configuration] = None,
8080
**kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
8181
) -> 'all_of_0':
8282
return super().__new__(
8383
cls,
84-
*args,
84+
*_args,
8585
foo=foo,
8686
_configuration=_configuration,
8787
**kwargs,
@@ -111,13 +111,13 @@ def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_proper
111111

112112
def __new__(
113113
cls,
114-
*args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
114+
*_args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
115115
_configuration: typing.Optional[schemas.Configuration] = None,
116116
**kwargs: typing.Union[MetaOapg.additional_properties, bool, ],
117117
) -> 'AdditionalpropertiesShouldNotLookInApplicators':
118118
return super().__new__(
119119
cls,
120-
*args,
120+
*_args,
121121
_configuration=_configuration,
122122
**kwargs,
123123
)

‎samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/model/additionalproperties_should_not_look_in_applicators.pyi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ class AdditionalpropertiesShouldNotLookInApplicators(
7474

7575
def __new__(
7676
cls,
77-
*args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
77+
*_args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
7878
foo: typing.Union[MetaOapg.properties.foo, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
7979
_configuration: typing.Optional[schemas.Configuration] = None,
8080
**kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
8181
) -> 'all_of_0':
8282
return super().__new__(
8383
cls,
84-
*args,
84+
*_args,
8585
foo=foo,
8686
_configuration=_configuration,
8787
**kwargs,
@@ -111,13 +111,13 @@ class AdditionalpropertiesShouldNotLookInApplicators(
111111

112112
def __new__(
113113
cls,
114-
*args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
114+
*_args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
115115
_configuration: typing.Optional[schemas.Configuration] = None,
116116
**kwargs: typing.Union[MetaOapg.additional_properties, bool, ],
117117
) -> 'AdditionalpropertiesShouldNotLookInApplicators':
118118
return super().__new__(
119119
cls,
120-
*args,
120+
*_args,
121121
_configuration=_configuration,
122122
**kwargs,
123123
)

‎samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/model/allof.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,14 @@ def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["bar", ], s
7878

7979
def __new__(
8080
cls,
81-
*args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
81+
*_args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
8282
bar: typing.Union[MetaOapg.properties.bar, decimal.Decimal, int, ],
8383
_configuration: typing.Optional[schemas.Configuration] = None,
8484
**kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
8585
) -> 'all_of_0':
8686
return super().__new__(
8787
cls,
88-
*args,
88+
*_args,
8989
bar=bar,
9090
_configuration=_configuration,
9191
**kwargs,
@@ -134,14 +134,14 @@ def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", ], s
134134

135135
def __new__(
136136
cls,
137-
*args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
137+
*_args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
138138
foo: typing.Union[MetaOapg.properties.foo, str, ],
139139
_configuration: typing.Optional[schemas.Configuration] = None,
140140
**kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
141141
) -> 'all_of_1':
142142
return super().__new__(
143143
cls,
144-
*args,
144+
*_args,
145145
foo=foo,
146146
_configuration=_configuration,
147147
**kwargs,
@@ -165,13 +165,13 @@ def all_of(cls):
165165

166166
def __new__(
167167
cls,
168-
*args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
168+
*_args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
169169
_configuration: typing.Optional[schemas.Configuration] = None,
170170
**kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
171171
) -> 'Allof':
172172
return super().__new__(
173173
cls,
174-
*args,
174+
*_args,
175175
_configuration=_configuration,
176176
**kwargs,
177177
)

‎samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/model/allof.pyi

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,14 @@ class Allof(
7878

7979
def __new__(
8080
cls,
81-
*args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
81+
*_args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
8282
bar: typing.Union[MetaOapg.properties.bar, decimal.Decimal, int, ],
8383
_configuration: typing.Optional[schemas.Configuration] = None,
8484
**kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
8585
) -> 'all_of_0':
8686
return super().__new__(
8787
cls,
88-
*args,
88+
*_args,
8989
bar=bar,
9090
_configuration=_configuration,
9191
**kwargs,
@@ -134,14 +134,14 @@ class Allof(
134134

135135
def __new__(
136136
cls,
137-
*args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
137+
*_args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
138138
foo: typing.Union[MetaOapg.properties.foo, str, ],
139139
_configuration: typing.Optional[schemas.Configuration] = None,
140140
**kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
141141
) -> 'all_of_1':
142142
return super().__new__(
143143
cls,
144-
*args,
144+
*_args,
145145
foo=foo,
146146
_configuration=_configuration,
147147
**kwargs,
@@ -165,13 +165,13 @@ class Allof(
165165

166166
def __new__(
167167
cls,
168-
*args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
168+
*_args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
169169
_configuration: typing.Optional[schemas.Configuration] = None,
170170
**kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
171171
) -> 'Allof':
172172
return super().__new__(
173173
cls,
174-
*args,
174+
*_args,
175175
_configuration=_configuration,
176176
**kwargs,
177177
)

0 commit comments

Comments
 (0)