Skip to content

Commit ad72128

Browse files
committed
fix model_generic.mustache
{{! Single value enum - use Literal }} {{name}}: Literal['{{{.}}}'] = Field(
1 parent 6189c8a commit ad72128

33 files changed

Lines changed: 58 additions & 58 deletions

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ from pydantic import Field
1717
from typing import TYPE_CHECKING
1818
if TYPE_CHECKING:
1919
{{#mappedModels}}
20-
from {{packageName}}.models.{{model.classFilename}} import {{modelName}}
20+
from {{packageName}}.models.{{model.classFilename}} import {{modelName}}
2121
{{/mappedModels}}
2222

2323
{{/discriminator}}
@@ -34,7 +34,7 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
3434
{{#-first}}
3535
{{#-last}}
3636
{{! Single value enum - use Literal }}
37-
{{name}}: {{#required}}Literal[{{#isString}}"{{{.}}}"{{/isString}}{{^isString}}{{{.}}}{{/isString}}]{{/required}}{{^required}}Optional[Literal[{{#isString}}"{{{.}}}"{{/isString}}{{^isString}}{{{.}}}{{/isString}}]]{{/required}} = Field(
37+
{{name}}: Literal['{{{.}}}'] = Field(
3838
{{#required}}...{{/required}}{{^required}}None{{/required}},
3939
description="{{description}}{{^description}}{{{name}}} of the {{classname}}{{/description}}",
4040
alias="{{{baseName}}}"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424

2525
from typing import TYPE_CHECKING
2626
if TYPE_CHECKING:
27-
from petstore_api.models.cat import Cat
28-
from petstore_api.models.dog import Dog
27+
from petstore_api.models.cat import Cat
28+
from petstore_api.models.dog import Dog
2929

3030
class Animal(BaseModel):
3131
"""

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424

2525
from typing import TYPE_CHECKING
2626
if TYPE_CHECKING:
27-
from petstore_api.models.primitive_string import PrimitiveString
28-
from petstore_api.models.info import Info
27+
from petstore_api.models.primitive_string import PrimitiveString
28+
from petstore_api.models.info import Info
2929

3030
class BaseDiscriminator(BaseModel):
3131
"""

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ class Bathing(BaseModel):
2525
"""
2626
Bathing
2727
""" # noqa: E501
28-
task_name: Literal["cleaning_deep"] = Field(
28+
task_name: Literal['cleaning_deep'] = Field(
2929
...,
3030
description="task_name of the Bathing",
3131
alias="task_name"
3232
)
33-
function_name: Literal["care_nourish"] = Field(
33+
function_name: Literal['care_nourish'] = Field(
3434
...,
3535
description="function_name of the Bathing",
3636
alias="function_name"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
from typing import TYPE_CHECKING
2727
if TYPE_CHECKING:
28-
from petstore_api.models.hunting_dog import HuntingDog
28+
from petstore_api.models.hunting_dog import HuntingDog
2929

3030
class Creature(BaseModel):
3131
"""

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
from typing import TYPE_CHECKING
2626
if TYPE_CHECKING:
27-
from petstore_api.models.discriminator_all_of_sub import DiscriminatorAllOfSub
27+
from petstore_api.models.discriminator_all_of_sub import DiscriminatorAllOfSub
2828

2929
class DiscriminatorAllOfSuper(BaseModel):
3030
"""

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ class EnumTest(BaseModel):
5151
None,
5252
description="enum_number of the EnumTest"
5353
)
54-
enum_string_single_member: Optional[Literal["abc"]] = Field(
54+
enum_string_single_member: Literal['abc'] = Field(
5555
None,
5656
description="enum_string_single_member of the EnumTest",
5757
alias="enum_string_single_member"
5858
)
59-
enum_integer_single_member: Optional[Literal[100]] = Field(
59+
enum_integer_single_member: Literal['100'] = Field(
6060
None,
6161
description="enum_integer_single_member of the EnumTest",
6262
alias="enum_integer_single_member"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ class Feeding(BaseModel):
2525
"""
2626
Feeding
2727
""" # noqa: E501
28-
task_name: Literal["cleaning"] = Field(
28+
task_name: Literal['cleaning'] = Field(
2929
...,
3030
description="task_name of the Feeding",
3131
alias="task_name"
3232
)
33-
function_name: Literal["care_nourish"] = Field(
33+
function_name: Literal['care_nourish'] = Field(
3434
...,
3535
description="function_name of the Feeding",
3636
alias="function_name"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ class PoopCleaning(BaseModel):
2525
"""
2626
PoopCleaning
2727
""" # noqa: E501
28-
task_name: Literal["cleaning"] = Field(
28+
task_name: Literal['cleaning'] = Field(
2929
...,
3030
description="task_name of the PoopCleaning",
3131
alias="task_name"
3232
)
33-
function_name: Literal["care"] = Field(
33+
function_name: Literal['care'] = Field(
3434
...,
3535
description="function_name of the PoopCleaning",
3636
alias="function_name"

samples/openapi3/client/petstore/python-httpx/petstore_api/models/animal.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424

2525
from typing import TYPE_CHECKING
2626
if TYPE_CHECKING:
27-
from petstore_api.models.cat import Cat
28-
from petstore_api.models.dog import Dog
27+
from petstore_api.models.cat import Cat
28+
from petstore_api.models.dog import Dog
2929

3030
class Animal(BaseModel):
3131
"""

0 commit comments

Comments
 (0)