Skip to content

Commit e2bfabd

Browse files
committed
Remove pydantic warnings when using model_dump by fixing one_of_schemas type
1 parent 34a386c commit e2bfabd

File tree

11 files changed

+11
-11
lines changed

11 files changed

+11
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
2222
{{vendorExtensions.x-py-name}}: {{{vendorExtensions.x-py-typing}}}
2323
{{/composedSchemas.oneOf}}
2424
actual_instance: Optional[Union[{{#oneOf}}{{{.}}}{{^-last}}, {{/-last}}{{/oneOf}}]] = None
25-
one_of_schemas: List[str] = Field(default=Literal[{{#oneOf}}"{{.}}"{{^-last}}, {{/-last}}{{/oneOf}}])
25+
one_of_schemas: set[str] = { {{#oneOf}}"{{.}}"{{^-last}}, {{/-last}}{{/oneOf}} }
2626

2727
model_config = ConfigDict(
2828
validate_assignment=True,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class Color(BaseModel):
3535
# data type: str
3636
oneof_schema_3_validator: Optional[Annotated[str, Field(min_length=7, strict=True, max_length=7)]] = Field(default=None, description="Hex color string, such as #00FF00.")
3737
actual_instance: Optional[Union[List[int], str]] = None
38-
one_of_schemas: List[str] = Field(default=Literal["List[int]", "str"])
38+
one_of_schemas: set[str] = { "List[int]", "str" }
3939

4040
model_config = ConfigDict(
4141
validate_assignment=True,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class IntOrString(BaseModel):
3333
# data type: str
3434
oneof_schema_2_validator: Optional[StrictStr] = None
3535
actual_instance: Optional[Union[int, str]] = None
36-
one_of_schemas: List[str] = Field(default=Literal["int", "str"])
36+
one_of_schemas: set[str] = { "int", "str" }
3737

3838
model_config = ConfigDict(
3939
validate_assignment=True,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class OneOfEnumString(BaseModel):
3434
# data type: EnumString2
3535
oneof_schema_2_validator: Optional[EnumString2] = None
3636
actual_instance: Optional[Union[EnumString1, EnumString2]] = None
37-
one_of_schemas: List[str] = Field(default=Literal["EnumString1", "EnumString2"])
37+
one_of_schemas: set[str] = { "EnumString1", "EnumString2" }
3838

3939
model_config = ConfigDict(
4040
validate_assignment=True,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class Pig(BaseModel):
3434
# data type: DanishPig
3535
oneof_schema_2_validator: Optional[DanishPig] = None
3636
actual_instance: Optional[Union[BasquePig, DanishPig]] = None
37-
one_of_schemas: List[str] = Field(default=Literal["BasquePig", "DanishPig"])
37+
one_of_schemas: set[str] = { "BasquePig", "DanishPig" }
3838

3939
model_config = ConfigDict(
4040
validate_assignment=True,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class TaskActivity(BaseModel):
3737
# data type: Bathing
3838
oneof_schema_3_validator: Optional[Bathing] = None
3939
actual_instance: Optional[Union[Bathing, Feeding, PoopCleaning]] = None
40-
one_of_schemas: List[str] = Field(default=Literal["Bathing", "Feeding", "PoopCleaning"])
40+
one_of_schemas: set[str] = { "Bathing", "Feeding", "PoopCleaning" }
4141

4242
model_config = ConfigDict(
4343
validate_assignment=True,

samples/openapi3/client/petstore/python/petstore_api/models/color.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class Color(BaseModel):
3535
# data type: str
3636
oneof_schema_3_validator: Optional[Annotated[str, Field(min_length=7, strict=True, max_length=7)]] = Field(default=None, description="Hex color string, such as #00FF00.")
3737
actual_instance: Optional[Union[List[int], str]] = None
38-
one_of_schemas: List[str] = Field(default=Literal["List[int]", "str"])
38+
one_of_schemas: set[str] = { "List[int]", "str" }
3939

4040
model_config = ConfigDict(
4141
validate_assignment=True,

samples/openapi3/client/petstore/python/petstore_api/models/int_or_string.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class IntOrString(BaseModel):
3333
# data type: str
3434
oneof_schema_2_validator: Optional[StrictStr] = None
3535
actual_instance: Optional[Union[int, str]] = None
36-
one_of_schemas: List[str] = Field(default=Literal["int", "str"])
36+
one_of_schemas: set[str] = { "int", "str" }
3737

3838
model_config = ConfigDict(
3939
validate_assignment=True,

samples/openapi3/client/petstore/python/petstore_api/models/one_of_enum_string.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class OneOfEnumString(BaseModel):
3434
# data type: EnumString2
3535
oneof_schema_2_validator: Optional[EnumString2] = None
3636
actual_instance: Optional[Union[EnumString1, EnumString2]] = None
37-
one_of_schemas: List[str] = Field(default=Literal["EnumString1", "EnumString2"])
37+
one_of_schemas: set[str] = { "EnumString1", "EnumString2" }
3838

3939
model_config = ConfigDict(
4040
validate_assignment=True,

samples/openapi3/client/petstore/python/petstore_api/models/pig.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class Pig(BaseModel):
3434
# data type: DanishPig
3535
oneof_schema_2_validator: Optional[DanishPig] = None
3636
actual_instance: Optional[Union[BasquePig, DanishPig]] = None
37-
one_of_schemas: List[str] = Field(default=Literal["BasquePig", "DanishPig"])
37+
one_of_schemas: set[str] = { "BasquePig", "DanishPig" }
3838

3939
model_config = ConfigDict(
4040
validate_assignment=True,

samples/openapi3/client/petstore/python/petstore_api/models/task_activity.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class TaskActivity(BaseModel):
3737
# data type: Bathing
3838
oneof_schema_3_validator: Optional[Bathing] = None
3939
actual_instance: Optional[Union[Bathing, Feeding, PoopCleaning]] = None
40-
one_of_schemas: List[str] = Field(default=Literal["Bathing", "Feeding", "PoopCleaning"])
40+
one_of_schemas: set[str] = { "Bathing", "Feeding", "PoopCleaning" }
4141

4242
model_config = ConfigDict(
4343
validate_assignment=True,

0 commit comments

Comments
 (0)