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

Commit a9432d2

Browse files
committed
Input arg in new for more than one type uses newline
1 parent de8d7f7 commit a9432d2

File tree

7 files changed

+102
-22
lines changed

7 files changed

+102
-22
lines changed

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,13 @@ def __new__(
108108
{{/contains}}
109109
{{else}}
110110
{{#contains types "object"}}
111-
*args_: typing.Union[{{> _helper_schema_python_types }}],
111+
*args_: typing.Union[
112+
{{> _helper_schema_python_types_newline }}
113+
],
112114
{{else}}
113-
arg_: typing.Union[{{> _helper_schema_python_types }}],
115+
arg_: typing.Union[
116+
{{> _helper_schema_python_types_newline }}
117+
],
114118
{{/contains}}
115119
{{/eq}}
116120
{{else}}

samples/openapi3/client/petstore/python/src/petstore_api/components/schema/apple.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,11 @@ def __getitem__(
104104

105105
def __new__(
106106
cls,
107-
*args_: typing.Union[None, dict, frozendict.frozendict],
107+
*args_: typing.Union[
108+
None,
109+
dict,
110+
frozendict.frozendict
111+
],
108112
origin: typing.Union[
109113
Schema_.Properties.Origin,
110114
schemas.Unset,

samples/openapi3/client/petstore/python/src/petstore_api/components/schema/health_check_result.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,10 @@ class Schema_:
4646

4747
def __new__(
4848
cls,
49-
arg_: typing.Union[None, str],
49+
arg_: typing.Union[
50+
None,
51+
str
52+
],
5053
configuration_: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None,
5154
) -> HealthCheckResult.Schema_.Properties.NullableMessage[
5255
typing.Union[

samples/openapi3/client/petstore/python/src/petstore_api/components/schema/nullable_class.py

Lines changed: 74 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,11 @@ class Schema_:
4545

4646
def __new__(
4747
cls,
48-
arg_: typing.Union[None, decimal.Decimal, int],
48+
arg_: typing.Union[
49+
None,
50+
decimal.Decimal,
51+
int
52+
],
4953
configuration_: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None,
5054
) -> NullableClass.Schema_.Properties.IntegerProp[
5155
typing.Union[
@@ -87,7 +91,12 @@ class Schema_:
8791

8892
def __new__(
8993
cls,
90-
arg_: typing.Union[None, decimal.Decimal, int, float],
94+
arg_: typing.Union[
95+
None,
96+
decimal.Decimal,
97+
int,
98+
float
99+
],
91100
configuration_: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None,
92101
) -> NullableClass.Schema_.Properties.NumberProp[
93102
typing.Union[
@@ -129,7 +138,10 @@ class Schema_:
129138

130139
def __new__(
131140
cls,
132-
arg_: typing.Union[None, bool],
141+
arg_: typing.Union[
142+
None,
143+
bool
144+
],
133145
configuration_: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None,
134146
) -> NullableClass.Schema_.Properties.BooleanProp[
135147
typing.Union[
@@ -171,7 +183,10 @@ class Schema_:
171183

172184
def __new__(
173185
cls,
174-
arg_: typing.Union[None, str],
186+
arg_: typing.Union[
187+
None,
188+
str
189+
],
175190
configuration_: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None,
176191
) -> NullableClass.Schema_.Properties.StringProp[
177192
typing.Union[
@@ -215,7 +230,11 @@ class Schema_:
215230

216231
def __new__(
217232
cls,
218-
arg_: typing.Union[None, str, datetime.date],
233+
arg_: typing.Union[
234+
None,
235+
str,
236+
datetime.date
237+
],
219238
configuration_: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None,
220239
) -> NullableClass.Schema_.Properties.DateProp[
221240
typing.Union[
@@ -259,7 +278,11 @@ class Schema_:
259278

260279
def __new__(
261280
cls,
262-
arg_: typing.Union[None, str, datetime.datetime],
281+
arg_: typing.Union[
282+
None,
283+
str,
284+
datetime.datetime
285+
],
263286
configuration_: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None,
264287
) -> NullableClass.Schema_.Properties.DatetimeProp[
265288
typing.Union[
@@ -302,7 +325,11 @@ class Schema_:
302325

303326
def __new__(
304327
cls,
305-
arg_: typing.Union[None, list, tuple],
328+
arg_: typing.Union[
329+
None,
330+
list,
331+
tuple
332+
],
306333
configuration_: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None,
307334
) -> NullableClass.Schema_.Properties.ArrayNullableProp[
308335
typing.Union[
@@ -359,7 +386,11 @@ class Schema_:
359386

360387
def __new__(
361388
cls,
362-
*args_: typing.Union[None, dict, frozendict.frozendict],
389+
*args_: typing.Union[
390+
None,
391+
dict,
392+
frozendict.frozendict
393+
],
363394
configuration_: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None,
364395
**kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
365396
) -> NullableClass.Schema_.Properties.ArrayAndItemsNullableProp.Schema_.Items[
@@ -388,7 +419,11 @@ def __new__(
388419

389420
def __new__(
390421
cls,
391-
arg_: typing.Union[None, list, tuple],
422+
arg_: typing.Union[
423+
None,
424+
list,
425+
tuple
426+
],
392427
configuration_: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None,
393428
) -> NullableClass.Schema_.Properties.ArrayAndItemsNullableProp[
394429
typing.Union[
@@ -439,7 +474,11 @@ class Schema_:
439474

440475
def __new__(
441476
cls,
442-
*args_: typing.Union[None, dict, frozendict.frozendict],
477+
*args_: typing.Union[
478+
None,
479+
dict,
480+
frozendict.frozendict
481+
],
443482
configuration_: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None,
444483
**kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
445484
) -> NullableClass.Schema_.Properties.ArrayItemsNullable.Schema_.Items[
@@ -533,7 +572,11 @@ def __getitem__(self, name: str) -> Schema_.AdditionalProperties[frozendict.froz
533572

534573
def __new__(
535574
cls,
536-
*args_: typing.Union[None, dict, frozendict.frozendict],
575+
*args_: typing.Union[
576+
None,
577+
dict,
578+
frozendict.frozendict
579+
],
537580
configuration_: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None,
538581
**kwargs: typing.Union[
539582
Schema_.AdditionalProperties,
@@ -596,7 +639,11 @@ class Schema_:
596639

597640
def __new__(
598641
cls,
599-
*args_: typing.Union[None, dict, frozendict.frozendict],
642+
*args_: typing.Union[
643+
None,
644+
dict,
645+
frozendict.frozendict
646+
],
600647
configuration_: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None,
601648
**kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
602649
) -> NullableClass.Schema_.Properties.ObjectAndItemsNullableProp.Schema_.AdditionalProperties[
@@ -632,7 +679,11 @@ def __getitem__(self, name: str) -> Schema_.AdditionalProperties[typing.Union[
632679

633680
def __new__(
634681
cls,
635-
*args_: typing.Union[None, dict, frozendict.frozendict],
682+
*args_: typing.Union[
683+
None,
684+
dict,
685+
frozendict.frozendict
686+
],
636687
configuration_: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None,
637688
**kwargs: typing.Union[
638689
Schema_.AdditionalProperties,
@@ -690,7 +741,11 @@ class Schema_:
690741

691742
def __new__(
692743
cls,
693-
*args_: typing.Union[None, dict, frozendict.frozendict],
744+
*args_: typing.Union[
745+
None,
746+
dict,
747+
frozendict.frozendict
748+
],
694749
configuration_: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None,
695750
**kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
696751
) -> NullableClass.Schema_.Properties.ObjectItemsNullable.Schema_.AdditionalProperties[
@@ -778,7 +833,11 @@ class Schema_:
778833

779834
def __new__(
780835
cls,
781-
*args_: typing.Union[None, dict, frozendict.frozendict],
836+
*args_: typing.Union[
837+
None,
838+
dict,
839+
frozendict.frozendict
840+
],
782841
configuration_: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None,
783842
**kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
784843
) -> NullableClass.Schema_.AdditionalProperties[

samples/openapi3/client/petstore/python/src/petstore_api/components/schema/nullable_string.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ class Schema_:
3333

3434
def __new__(
3535
cls,
36-
arg_: typing.Union[None, str],
36+
arg_: typing.Union[
37+
None,
38+
str
39+
],
3740
configuration_: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None,
3841
) -> NullableString[
3942
typing.Union[

samples/openapi3/client/petstore/python/src/petstore_api/components/schema/string_enum.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,10 @@ def NONE(cls):
7070

7171
def __new__(
7272
cls,
73-
arg_: typing.Union[None, str],
73+
arg_: typing.Union[
74+
None,
75+
str
76+
],
7477
configuration_: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None,
7578
) -> StringEnum[
7679
typing.Union[

samples/openapi3/client/petstore/python/src/petstore_api/components/schema/user.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@ class Schema_:
5353

5454
def __new__(
5555
cls,
56-
*args_: typing.Union[None, dict, frozendict.frozendict],
56+
*args_: typing.Union[
57+
None,
58+
dict,
59+
frozendict.frozendict
60+
],
5761
configuration_: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None,
5862
**kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
5963
) -> User.Schema_.Properties.ObjectWithNoDeclaredPropsNullable[

0 commit comments

Comments
 (0)