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

Issue 69 fix allow arg and args properties #71

Merged
merged 5 commits into from
Nov 9, 2022
Merged

Issue 69 fix allow arg and args properties #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c4c8e7
Template updates
spacether Nov 9, 2022
41df4b9
Adds new component to spec
spacether Nov 9, 2022
9abd40a
Samples regenerated
spacether Nov 9, 2022
dfb05be
Adds manual test
spacether Nov 9, 2022
1505ce7
Adds newline back to template, regens samples
spacether Nov 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 6 additions & 6 deletions ...es/openapi-json-schema-generator/src/main/resources/python/model_templates/new.handlebars
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
def __new__(
cls,
{{#if getHasMultipleTypes}}
*args: typing.Union[{{> model_templates/schema_python_types }}],
*_args: typing.Union[{{> model_templates/schema_python_types }}],
{{else}}
{{#if isArray }}
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}}]],
_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}}]],
{{else}}
*args: typing.Union[{{> model_templates/schema_python_types }}],
*_args: typing.Union[{{> model_templates/schema_python_types }}],
{{/if}}
{{/if}}
{{#unless isNull}}
Expand Down Expand Up @@ -61,12 +61,12 @@ def __new__(
return super().__new__(
cls,
{{#if getHasMultipleTypes}}
*args,
*_args,
{{else}}
{{#if isArray }}
arg,
_arg,
{{else}}
*args,
*_args,
{{/if}}
{{/if}}
{{#unless isNull}}
Expand Down
136 changes: 68 additions & 68 deletions modules/openapi-json-schema-generator/src/main/resources/python/schemas.handlebars
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions ...urces/3_0/python/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2038,6 +2038,16 @@ components:
- (xyz)
- COUNT_1M
- COUNT_50M
ObjectModelWithArgAndArgsProperties:
type: object
properties:
arg:
type: string
args:
type: string
required:
- arg
- args
Enum_Test:
type: object
required:
Expand Down
4 changes: 2 additions & 2 deletions .../python/unit_test_api/model/additionalproperties_allows_a_schema_which_should_validate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,15 @@ def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo"], typ

def __new__(
cls,
*args: typing.Union[dict, frozendict.frozendict, ],
*_args: typing.Union[dict, frozendict.frozendict, ],
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,
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,
_configuration: typing.Optional[schemas.Configuration] = None,
**kwargs: typing.Union[MetaOapg.additional_properties, bool, ],
) -> 'AdditionalpropertiesAllowsASchemaWhichShouldValidate':
return super().__new__(
cls,
*args,
*_args,
foo=foo,
bar=bar,
_configuration=_configuration,
Expand Down
4 changes: 2 additions & 2 deletions ...python/unit_test_api/model/additionalproperties_allows_a_schema_which_should_validate.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,15 @@ class AdditionalpropertiesAllowsASchemaWhichShouldValidate(

def __new__(
cls,
*args: typing.Union[dict, frozendict.frozendict, ],
*_args: typing.Union[dict, frozendict.frozendict, ],
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,
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,
_configuration: typing.Optional[schemas.Configuration] = None,
**kwargs: typing.Union[MetaOapg.additional_properties, bool, ],
) -> 'AdditionalpropertiesAllowsASchemaWhichShouldValidate':
return super().__new__(
cls,
*args,
*_args,
foo=foo,
bar=bar,
_configuration=_configuration,
Expand Down
4 changes: 2 additions & 2 deletions ...3_0_3_unit_test/python/unit_test_api/model/additionalproperties_are_allowed_by_default.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@ def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", "bar

def __new__(
cls,
*args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
*_args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
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,
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,
_configuration: typing.Optional[schemas.Configuration] = None,
**kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
) -> 'AdditionalpropertiesAreAllowedByDefault':
return super().__new__(
cls,
*args,
*_args,
foo=foo,
bar=bar,
_configuration=_configuration,
Expand Down
4 changes: 2 additions & 2 deletions ..._0_3_unit_test/python/unit_test_api/model/additionalproperties_are_allowed_by_default.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@ class AdditionalpropertiesAreAllowedByDefault(

def __new__(
cls,
*args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
*_args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
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,
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,
_configuration: typing.Optional[schemas.Configuration] = None,
**kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
) -> 'AdditionalpropertiesAreAllowedByDefault':
return super().__new__(
cls,
*args,
*_args,
foo=foo,
bar=bar,
_configuration=_configuration,
Expand Down
4 changes: 2 additions & 2 deletions ...nt/3_0_3_unit_test/python/unit_test_api/model/additionalproperties_can_exist_by_itself.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_proper

def __new__(
cls,
*args: typing.Union[dict, frozendict.frozendict, ],
*_args: typing.Union[dict, frozendict.frozendict, ],
_configuration: typing.Optional[schemas.Configuration] = None,
**kwargs: typing.Union[MetaOapg.additional_properties, bool, ],
) -> 'AdditionalpropertiesCanExistByItself':
return super().__new__(
cls,
*args,
*_args,
_configuration=_configuration,
**kwargs,
)
4 changes: 2 additions & 2 deletions ...t/3_0_3_unit_test/python/unit_test_api/model/additionalproperties_can_exist_by_itself.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ class AdditionalpropertiesCanExistByItself(

def __new__(
cls,
*args: typing.Union[dict, frozendict.frozendict, ],
*_args: typing.Union[dict, frozendict.frozendict, ],
_configuration: typing.Optional[schemas.Configuration] = None,
**kwargs: typing.Union[MetaOapg.additional_properties, bool, ],
) -> 'AdditionalpropertiesCanExistByItself':
return super().__new__(
cls,
*args,
*_args,
_configuration=_configuration,
**kwargs,
)
8 changes: 4 additions & 4 deletions ...it_test/python/unit_test_api/model/additionalproperties_should_not_look_in_applicators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,14 @@ def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", ], s

def __new__(
cls,
*args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
*_args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
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,
_configuration: typing.Optional[schemas.Configuration] = None,
**kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
) -> 'all_of_0':
return super().__new__(
cls,
*args,
*_args,
foo=foo,
_configuration=_configuration,
**kwargs,
Expand Down Expand Up @@ -111,13 +111,13 @@ def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_proper

def __new__(
cls,
*args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
*_args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
_configuration: typing.Optional[schemas.Configuration] = None,
**kwargs: typing.Union[MetaOapg.additional_properties, bool, ],
) -> 'AdditionalpropertiesShouldNotLookInApplicators':
return super().__new__(
cls,
*args,
*_args,
_configuration=_configuration,
**kwargs,
)
8 changes: 4 additions & 4 deletions ...t_test/python/unit_test_api/model/additionalproperties_should_not_look_in_applicators.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,14 @@ class AdditionalpropertiesShouldNotLookInApplicators(

def __new__(
cls,
*args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
*_args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
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,
_configuration: typing.Optional[schemas.Configuration] = None,
**kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
) -> 'all_of_0':
return super().__new__(
cls,
*args,
*_args,
foo=foo,
_configuration=_configuration,
**kwargs,
Expand Down Expand Up @@ -111,13 +111,13 @@ class AdditionalpropertiesShouldNotLookInApplicators(

def __new__(
cls,
*args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
*_args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
_configuration: typing.Optional[schemas.Configuration] = None,
**kwargs: typing.Union[MetaOapg.additional_properties, bool, ],
) -> 'AdditionalpropertiesShouldNotLookInApplicators':
return super().__new__(
cls,
*args,
*_args,
_configuration=_configuration,
**kwargs,
)
12 changes: 6 additions & 6 deletions samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/model/allof.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,14 @@ def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["bar", ], s

def __new__(
cls,
*args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
*_args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
bar: typing.Union[MetaOapg.properties.bar, decimal.Decimal, int, ],
_configuration: typing.Optional[schemas.Configuration] = None,
**kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
) -> 'all_of_0':
return super().__new__(
cls,
*args,
*_args,
bar=bar,
_configuration=_configuration,
**kwargs,
Expand Down Expand Up @@ -134,14 +134,14 @@ def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", ], s

def __new__(
cls,
*args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
*_args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
foo: typing.Union[MetaOapg.properties.foo, str, ],
_configuration: typing.Optional[schemas.Configuration] = None,
**kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
) -> 'all_of_1':
return super().__new__(
cls,
*args,
*_args,
foo=foo,
_configuration=_configuration,
**kwargs,
Expand All @@ -165,13 +165,13 @@ def all_of(cls):

def __new__(
cls,
*args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
*_args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
_configuration: typing.Optional[schemas.Configuration] = None,
**kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
) -> 'Allof':
return super().__new__(
cls,
*args,
*_args,
_configuration=_configuration,
**kwargs,
)
12 changes: 6 additions & 6 deletions samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/model/allof.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,14 @@ class Allof(

def __new__(
cls,
*args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
*_args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
bar: typing.Union[MetaOapg.properties.bar, decimal.Decimal, int, ],
_configuration: typing.Optional[schemas.Configuration] = None,
**kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
) -> 'all_of_0':
return super().__new__(
cls,
*args,
*_args,
bar=bar,
_configuration=_configuration,
**kwargs,
Expand Down Expand Up @@ -134,14 +134,14 @@ class Allof(

def __new__(
cls,
*args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
*_args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
foo: typing.Union[MetaOapg.properties.foo, str, ],
_configuration: typing.Optional[schemas.Configuration] = None,
**kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
) -> 'all_of_1':
return super().__new__(
cls,
*args,
*_args,
foo=foo,
_configuration=_configuration,
**kwargs,
Expand All @@ -165,13 +165,13 @@ class Allof(

def __new__(
cls,
*args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
*_args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
_configuration: typing.Optional[schemas.Configuration] = None,
**kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
) -> 'Allof':
return super().__new__(
cls,
*args,
*_args,
_configuration=_configuration,
**kwargs,
)
Loading