Skip to content

Commit d4cc4f6

Browse files
padznichpadznich
committed
fix model_generic.mustache
add to_json / to_dict/ to_str ./mvnw clean package || exit ./bin/generate-samples.sh ./bin/configs/*.yaml || exit ./bin/utils/export_docs_generators.sh || exit
1 parent 7030a2e commit d4cc4f6

52 files changed

Lines changed: 200 additions & 200 deletions

Some content is hidden

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

‎modules/openapi-generator/src/main/resources/python/model_generic.mustache‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
4444
{{/-last}}
4545
{{^-last}}
4646
{{! Multiple value enum - use Literal for inline enums }}
47-
{{name}}: {{#required}}Literal[{{#allowableValues}}{{#enumVars}}{{#isString}}"{{{value}}}"{{/isString}}{{^isString}}{{{value}}}{{/isString}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}}]{{/required}}{{^required}}Optional[Literal[{{#allowableValues}}{{#enumVars}}{{#isString}}"{{{value}}}"{{/isString}}{{^isString}}{{{value}}}{{/isString}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}}]]{{/required}} = Field(
47+
{{name}}: {{#required}}Literal[{{#allowableValues}}{{#enumVars}}{{#isString}}{{{value}}}{{/isString}}{{^isString}}{{{value}}}{{/isString}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}}]{{/required}}{{^required}}Optional[Literal[{{#allowableValues}}{{#enumVars}}{{#isString}}{{{value}}}{{/isString}}{{^isString}}{{{value}}}{{/isString}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}}]]{{/required}} = Field(
4848
{{#required}}...{{/required}}{{^required}}None{{/required}},
4949
description="{{description}}{{^description}}{{{name}}} of the {{classname}}{{/description}}"
5050
)
@@ -54,7 +54,7 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
5454
{{/isArray}}
5555
{{#isArray}}
5656
{{! Array enum - use List[Literal] }}
57-
{{name}}: {{#required}}List[Literal[{{#allowableValues}}{{#enumVars}}{{#isString}}"{{{value}}}"{{/isString}}{{^isString}}{{{value}}}{{/isString}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}}]]{{/required}}{{^required}}Optional[List[Literal[{{#allowableValues}}{{#enumVars}}{{#isString}}"{{{value}}}"{{/isString}}{{^isString}}{{{value}}}{{/isString}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}}]]]{{/required}} = Field(
57+
{{name}}: {{#required}}List[Literal[{{#allowableValues}}{{#enumVars}}{{#isString}}{{{value}}}{{/isString}}{{^isString}}{{{value}}}{{/isString}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}}]]{{/required}}{{^required}}Optional[List[Literal[{{#allowableValues}}{{#enumVars}}{{#isString}}{{{value}}}{{/isString}}{{^isString}}{{{value}}}{{/isString}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}}]]]{{/required}} = Field(
5858
{{#required}}...{{/required}}{{^required}}None{{/required}},
5959
description="{{description}}{{^description}}{{{name}}} of the {{classname}}{{/description}}"
6060
)
@@ -111,18 +111,18 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
111111
{{#isContainer}}
112112
{{#isArray}}
113113
for i in value:
114-
if i not in set([{{#allowableValues}}{{#enumVars}}{{#isString}}"{{{value}}}"{{/isString}}{{^isString}}{{{value}}}{{/isString}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}}]):
115-
raise ValueError("each list item must be one of ({{#allowableValues}}{{#enumVars}}{{#isString}}"{{{value}}}"{{/isString}}{{^isString}}{{{value}}}{{/isString}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}})")
114+
if i not in set([{{#allowableValues}}{{#enumVars}}{{#isString}}{{{value}}}{{/isString}}{{^isString}}{{{value}}}{{/isString}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}}]):
115+
raise ValueError("each list item must be one of ({{#allowableValues}}{{#enumVars}}{{#isString}}{{{value}}}{{/isString}}{{^isString}}{{{value}}}{{/isString}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}})")
116116
{{/isArray}}
117117
{{#isMap}}
118118
for i in value.values():
119-
if i not in set([{{#allowableValues}}{{#enumVars}}{{#isString}}"{{{value}}}"{{/isString}}{{^isString}}{{{value}}}{{/isString}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}}]):
120-
raise ValueError("dict values must be one of enum values ({{#allowableValues}}{{#enumVars}}{{#isString}}"{{{value}}}"{{/isString}}{{^isString}}{{{value}}}{{/isString}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}})")
119+
if i not in set([{{#allowableValues}}{{#enumVars}}{{#isString}}{{{value}}}{{/isString}}{{^isString}}{{{value}}}{{/isString}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}}]):
120+
raise ValueError("dict values must be one of enum values ({{#allowableValues}}{{#enumVars}}{{#isString}}{{{value}}}{{/isString}}{{^isString}}{{{value}}}{{/isString}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}})")
121121
{{/isMap}}
122122
{{/isContainer}}
123123
{{^isContainer}}
124-
if value not in set([{{#allowableValues}}{{#enumVars}}{{#isString}}"{{{value}}}"{{/isString}}{{^isString}}{{{value}}}{{/isString}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}}]):
125-
raise ValueError("must be one of enum values ({{#allowableValues}}{{#enumVars}}{{#isString}}"{{{value}}}"{{/isString}}{{^isString}}{{{value}}}{{/isString}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}})")
124+
if value not in set([{{#allowableValues}}{{#enumVars}}{{#isString}}{{{value}}}{{/isString}}{{^isString}}{{{value}}}{{/isString}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}}]):
125+
raise ValueError("must be one of enum values ({{#allowableValues}}{{#enumVars}}{{#isString}}{{{value}}}{{/isString}}{{^isString}}{{{value}}}{{/isString}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}})")
126126
{{/isContainer}}
127127
return value
128128
{{/isEnum}}

‎modules/openapi-generator/src/main/resources/python/model_oneof.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ class {{classname}}(RootModel[Union[{{#oneOf}}{{{.}}}{{^-last}}, {{/-last}}{{/on
1414
"""
1515
{{{description}}}{{^description}}{{{classname}}}{{/description}}
1616
"""
17-
root: Union[{{#oneOf}}{{.}}{{^-last}}, {{/-last}}{{/oneOf}}] = Field(
18-
...{{#discriminator}}, discriminator="{{discriminatorName}}"{{/discriminator}}
17+
root: Union[{{#oneOf}}{{.}}{{^-last}}, {{/-last}}{{/oneOf}}{{#isNullable}}, None{{/isNullable}}] = Field(
18+
{{#isNullable}}None{{/isNullable}}{{^isNullable}}...{{/isNullable}}{{#discriminator}}, discriminator="{{discriminatorName}}"{{/discriminator}}
1919
)
2020

2121
def __getattr__(self, name):

‎samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/default_value.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class DefaultValue(BaseModel):
3030
to test the default value of properties
3131
""" # noqa: E501
3232
array_string_enum_ref_default: Optional[List[StringEnumRef]] = None
33-
array_string_enum_default: Optional[List[Literal["'success'", "'failure'", "'unclassified'"]]] = Field(
33+
array_string_enum_default: Optional[List[Literal['success', 'failure', 'unclassified']]] = Field(
3434
None,
3535
description="array_string_enum_default of the DefaultValue"
3636
)
@@ -49,8 +49,8 @@ def array_string_enum_default_validate_enum(cls, value):
4949
return value
5050

5151
for i in value:
52-
if i not in set(["'success'", "'failure'", "'unclassified'"]):
53-
raise ValueError("each list item must be one of ("'success'", "'failure'", "'unclassified'")")
52+
if i not in set(['success', 'failure', 'unclassified']):
53+
raise ValueError("each list item must be one of ('success', 'failure', 'unclassified')")
5454
return value
5555

5656
model_config = ConfigDict(

‎samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/pet.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class Pet(BaseModel):
3535
category: Optional[Category] = None
3636
photo_urls: List[StrictStr] = Field(alias="photoUrls")
3737
tags: Optional[List[Tag]] = None
38-
status: Optional[Literal["'available'", "'pending'", "'sold'"]] = Field(
38+
status: Optional[Literal['available', 'pending', 'sold']] = Field(
3939
None,
4040
description="pet status in the store"
4141
)
@@ -47,8 +47,8 @@ def status_validate_enum(cls, value):
4747
if value is None:
4848
return value
4949

50-
if value not in set(["'available'", "'pending'", "'sold'"]):
51-
raise ValueError("must be one of enum values ("'available'", "'pending'", "'sold'")")
50+
if value not in set(['available', 'pending', 'sold']):
51+
raise ValueError("must be one of enum values ('available', 'pending', 'sold')")
5252
return value
5353

5454
model_config = ConfigDict(

‎samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/query.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class Query(BaseModel):
2929
Query
3030
""" # noqa: E501
3131
id: Optional[StrictInt] = Field(default=None, description="Query")
32-
outcomes: Optional[List[Literal["'SUCCESS'", "'FAILURE'", "'SKIPPED'"]]] = Field(
32+
outcomes: Optional[List[Literal['SUCCESS', 'FAILURE', 'SKIPPED']]] = Field(
3333
None,
3434
description="outcomes of the Query"
3535
)
@@ -42,8 +42,8 @@ def outcomes_validate_enum(cls, value):
4242
return value
4343

4444
for i in value:
45-
if i not in set(["'SUCCESS'", "'FAILURE'", "'SKIPPED'"]):
46-
raise ValueError("each list item must be one of ("'SUCCESS'", "'FAILURE'", "'SKIPPED'")")
45+
if i not in set(['SUCCESS', 'FAILURE', 'SKIPPED']):
46+
raise ValueError("each list item must be one of ('SUCCESS', 'FAILURE', 'SKIPPED')")
4747
return value
4848

4949
model_config = ConfigDict(

‎samples/client/echo_api/python/openapi_client/models/default_value.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class DefaultValue(BaseModel):
3030
to test the default value of properties
3131
""" # noqa: E501
3232
array_string_enum_ref_default: Optional[List[StringEnumRef]] = None
33-
array_string_enum_default: Optional[List[Literal["'success'", "'failure'", "'unclassified'"]]] = Field(
33+
array_string_enum_default: Optional[List[Literal['success', 'failure', 'unclassified']]] = Field(
3434
None,
3535
description="array_string_enum_default of the DefaultValue"
3636
)
@@ -49,8 +49,8 @@ def array_string_enum_default_validate_enum(cls, value):
4949
return value
5050

5151
for i in value:
52-
if i not in set(["'success'", "'failure'", "'unclassified'"]):
53-
raise ValueError("each list item must be one of ("'success'", "'failure'", "'unclassified'")")
52+
if i not in set(['success', 'failure', 'unclassified']):
53+
raise ValueError("each list item must be one of ('success', 'failure', 'unclassified')")
5454
return value
5555

5656
model_config = ConfigDict(

‎samples/client/echo_api/python/openapi_client/models/pet.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class Pet(BaseModel):
3535
category: Optional[Category] = None
3636
photo_urls: List[StrictStr] = Field(alias="photoUrls")
3737
tags: Optional[List[Tag]] = None
38-
status: Optional[Literal["'available'", "'pending'", "'sold'"]] = Field(
38+
status: Optional[Literal['available', 'pending', 'sold']] = Field(
3939
None,
4040
description="pet status in the store"
4141
)
@@ -47,8 +47,8 @@ def status_validate_enum(cls, value):
4747
if value is None:
4848
return value
4949

50-
if value not in set(["'available'", "'pending'", "'sold'"]):
51-
raise ValueError("must be one of enum values ("'available'", "'pending'", "'sold'")")
50+
if value not in set(['available', 'pending', 'sold']):
51+
raise ValueError("must be one of enum values ('available', 'pending', 'sold')")
5252
return value
5353

5454
model_config = ConfigDict(

‎samples/client/echo_api/python/openapi_client/models/query.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class Query(BaseModel):
2929
Query
3030
""" # noqa: E501
3131
id: Optional[StrictInt] = Field(default=None, description="Query")
32-
outcomes: Optional[List[Literal["'SUCCESS'", "'FAILURE'", "'SKIPPED'"]]] = Field(
32+
outcomes: Optional[List[Literal['SUCCESS', 'FAILURE', 'SKIPPED']]] = Field(
3333
None,
3434
description="outcomes of the Query"
3535
)
@@ -42,8 +42,8 @@ def outcomes_validate_enum(cls, value):
4242
return value
4343

4444
for i in value:
45-
if i not in set(["'SUCCESS'", "'FAILURE'", "'SKIPPED'"]):
46-
raise ValueError("each list item must be one of ("'SUCCESS'", "'FAILURE'", "'SKIPPED'")")
45+
if i not in set(['SUCCESS', 'FAILURE', 'SKIPPED']):
46+
raise ValueError("each list item must be one of ('SUCCESS', 'FAILURE', 'SKIPPED')")
4747
return value
4848

4949
model_config = ConfigDict(

‎samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/bathing.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ class Bathing(BaseModel):
4343
@field_validator('task_name')
4444
def task_name_validate_enum(cls, value):
4545
"""Validates the enum"""
46-
if value not in set(["'cleaning_deep'"]):
47-
raise ValueError("must be one of enum values ("'cleaning_deep'")")
46+
if value not in set(['cleaning_deep']):
47+
raise ValueError("must be one of enum values ('cleaning_deep')")
4848
return value
4949

5050
@field_validator('function_name')
5151
def function_name_validate_enum(cls, value):
5252
"""Validates the enum"""
53-
if value not in set(["'care_nourish'"]):
54-
raise ValueError("must be one of enum values ("'care_nourish'")")
53+
if value not in set(['care_nourish']):
54+
raise ValueError("must be one of enum values ('care_nourish')")
5555
return value
5656

5757
model_config = ConfigDict(

‎samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/color.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ class Color(RootModel[Union[List[int], str]]):
2525
"""
2626
RGB array, RGBA array, or hex string.
2727
"""
28-
root: Union[List[int], str] = Field(
29-
...
28+
root: Union[List[int], str, None] = Field(
29+
None
3030
)
3131

3232
def __getattr__(self, name):

0 commit comments

Comments
 (0)