Skip to content

Remove pydantic warnings when using model_dump as the default output is then overridden (#17939) #17941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 1 commit into from
Mar 11, 2024
Merged

Remove pydantic warnings when using model_dump as the default output is then overridden (#17939) #17941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/python/model_anyof.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import re # noqa: F401
{{#vendorExtensions.x-py-model-imports}}
{{{.}}}
{{/vendorExtensions.x-py-model-imports}}
from typing import Union, Any, List, TYPE_CHECKING, Optional, Dict
from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict
from typing_extensions import Literal, Self
from pydantic import Field

Expand All @@ -28,7 +28,7 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
actual_instance: Optional[Union[{{#anyOf}}{{{.}}}{{^-last}}, {{/-last}}{{/anyOf}}]] = None
else:
actual_instance: Any = None
any_of_schemas: List[str] = Field(default=Literal[{{#anyOf}}"{{.}}"{{^-last}}, {{/-last}}{{/anyOf}}])
any_of_schemas: Set[str] = { {{#anyOf}}"{{.}}"{{^-last}}, {{/-last}}{{/anyOf}} }

model_config = {
"validate_assignment": True,
Expand Down
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/python/model_oneof.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import pprint
{{{.}}}
{{/vendorExtensions.x-py-model-imports}}
from pydantic import StrictStr, Field
from typing import Union, List, Optional, Dict
from typing import Union, List, Set, Optional, Dict
from typing_extensions import Literal, Self

{{#lambda.uppercase}}{{{classname}}}{{/lambda.uppercase}}_ONE_OF_SCHEMAS = [{{#oneOf}}"{{.}}"{{^-last}}, {{/-last}}{{/oneOf}}]
Expand All @@ -22,7 +22,7 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
{{vendorExtensions.x-py-name}}: {{{vendorExtensions.x-py-typing}}}
{{/composedSchemas.oneOf}}
actual_instance: Optional[Union[{{#oneOf}}{{{.}}}{{^-last}}, {{/-last}}{{/oneOf}}]] = None
one_of_schemas: List[str] = Field(default=Literal[{{#oneOf}}"{{.}}"{{^-last}}, {{/-last}}{{/oneOf}}])
one_of_schemas: Set[str] = { {{#oneOf}}"{{.}}"{{^-last}}, {{/-last}}{{/oneOf}} }

model_config = ConfigDict(
validate_assignment=True,
Expand Down
4 changes: 2 additions & 2 deletions samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/any_of_color.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator
from typing import List, Optional
from typing_extensions import Annotated
from typing import Union, Any, List, TYPE_CHECKING, Optional, Dict
from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict
from typing_extensions import Literal, Self
from pydantic import Field

Expand All @@ -41,7 +41,7 @@ class AnyOfColor(BaseModel):
actual_instance: Optional[Union[List[int], str]] = None
else:
actual_instance: Any = None
any_of_schemas: List[str] = Field(default=Literal["List[int]", "str"])
any_of_schemas: Set[str] = { "List[int]", "str" }

model_config = {
"validate_assignment": True,
Expand Down
4 changes: 2 additions & 2 deletions samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/any_of_pig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from typing import Optional
from petstore_api.models.basque_pig import BasquePig
from petstore_api.models.danish_pig import DanishPig
from typing import Union, Any, List, TYPE_CHECKING, Optional, Dict
from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict
from typing_extensions import Literal, Self
from pydantic import Field

Expand All @@ -40,7 +40,7 @@ class AnyOfPig(BaseModel):
actual_instance: Optional[Union[BasquePig, DanishPig]] = None
else:
actual_instance: Any = None
any_of_schemas: List[str] = Field(default=Literal["BasquePig", "DanishPig"])
any_of_schemas: Set[str] = { "BasquePig", "DanishPig" }

model_config = {
"validate_assignment": True,
Expand Down
4 changes: 2 additions & 2 deletions samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/color.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from typing import Any, List, Optional
from typing_extensions import Annotated
from pydantic import StrictStr, Field
from typing import Union, List, Optional, Dict
from typing import Union, List, Set, Optional, Dict
from typing_extensions import Literal, Self

COLOR_ONE_OF_SCHEMAS = ["List[int]", "str"]
Expand All @@ -35,7 +35,7 @@ class Color(BaseModel):
# data type: str
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.")
actual_instance: Optional[Union[List[int], str]] = None
one_of_schemas: List[str] = Field(default=Literal["List[int]", "str"])
one_of_schemas: Set[str] = { "List[int]", "str" }

model_config = ConfigDict(
validate_assignment=True,
Expand Down
4 changes: 2 additions & 2 deletions samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/int_or_string.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from typing import Any, List, Optional
from typing_extensions import Annotated
from pydantic import StrictStr, Field
from typing import Union, List, Optional, Dict
from typing import Union, List, Set, Optional, Dict
from typing_extensions import Literal, Self

INTORSTRING_ONE_OF_SCHEMAS = ["int", "str"]
Expand All @@ -33,7 +33,7 @@ class IntOrString(BaseModel):
# data type: str
oneof_schema_2_validator: Optional[StrictStr] = None
actual_instance: Optional[Union[int, str]] = None
one_of_schemas: List[str] = Field(default=Literal["int", "str"])
one_of_schemas: Set[str] = { "int", "str" }

model_config = ConfigDict(
validate_assignment=True,
Expand Down
4 changes: 2 additions & 2 deletions samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/one_of_enum_string.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from petstore_api.models.enum_string1 import EnumString1
from petstore_api.models.enum_string2 import EnumString2
from pydantic import StrictStr, Field
from typing import Union, List, Optional, Dict
from typing import Union, List, Set, Optional, Dict
from typing_extensions import Literal, Self

ONEOFENUMSTRING_ONE_OF_SCHEMAS = ["EnumString1", "EnumString2"]
Expand All @@ -34,7 +34,7 @@ class OneOfEnumString(BaseModel):
# data type: EnumString2
oneof_schema_2_validator: Optional[EnumString2] = None
actual_instance: Optional[Union[EnumString1, EnumString2]] = None
one_of_schemas: List[str] = Field(default=Literal["EnumString1", "EnumString2"])
one_of_schemas: Set[str] = { "EnumString1", "EnumString2" }

model_config = ConfigDict(
validate_assignment=True,
Expand Down
4 changes: 2 additions & 2 deletions samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/pig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from petstore_api.models.basque_pig import BasquePig
from petstore_api.models.danish_pig import DanishPig
from pydantic import StrictStr, Field
from typing import Union, List, Optional, Dict
from typing import Union, List, Set, Optional, Dict
from typing_extensions import Literal, Self

PIG_ONE_OF_SCHEMAS = ["BasquePig", "DanishPig"]
Expand All @@ -34,7 +34,7 @@ class Pig(BaseModel):
# data type: DanishPig
oneof_schema_2_validator: Optional[DanishPig] = None
actual_instance: Optional[Union[BasquePig, DanishPig]] = None
one_of_schemas: List[str] = Field(default=Literal["BasquePig", "DanishPig"])
one_of_schemas: Set[str] = { "BasquePig", "DanishPig" }

model_config = ConfigDict(
validate_assignment=True,
Expand Down
4 changes: 2 additions & 2 deletions samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/task_activity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from petstore_api.models.feeding import Feeding
from petstore_api.models.poop_cleaning import PoopCleaning
from pydantic import StrictStr, Field
from typing import Union, List, Optional, Dict
from typing import Union, List, Set, Optional, Dict
from typing_extensions import Literal, Self

TASKACTIVITY_ONE_OF_SCHEMAS = ["Bathing", "Feeding", "PoopCleaning"]
Expand All @@ -37,7 +37,7 @@ class TaskActivity(BaseModel):
# data type: Bathing
oneof_schema_3_validator: Optional[Bathing] = None
actual_instance: Optional[Union[Bathing, Feeding, PoopCleaning]] = None
one_of_schemas: List[str] = Field(default=Literal["Bathing", "Feeding", "PoopCleaning"])
one_of_schemas: Set[str] = { "Bathing", "Feeding", "PoopCleaning" }

model_config = ConfigDict(
validate_assignment=True,
Expand Down
4 changes: 2 additions & 2 deletions samples/openapi3/client/petstore/python/petstore_api/models/any_of_color.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator
from typing import List, Optional
from typing_extensions import Annotated
from typing import Union, Any, List, TYPE_CHECKING, Optional, Dict
from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict
from typing_extensions import Literal, Self
from pydantic import Field

Expand All @@ -41,7 +41,7 @@ class AnyOfColor(BaseModel):
actual_instance: Optional[Union[List[int], str]] = None
else:
actual_instance: Any = None
any_of_schemas: List[str] = Field(default=Literal["List[int]", "str"])
any_of_schemas: Set[str] = { "List[int]", "str" }

model_config = {
"validate_assignment": True,
Expand Down
4 changes: 2 additions & 2 deletions samples/openapi3/client/petstore/python/petstore_api/models/any_of_pig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from typing import Optional
from petstore_api.models.basque_pig import BasquePig
from petstore_api.models.danish_pig import DanishPig
from typing import Union, Any, List, TYPE_CHECKING, Optional, Dict
from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict
from typing_extensions import Literal, Self
from pydantic import Field

Expand All @@ -40,7 +40,7 @@ class AnyOfPig(BaseModel):
actual_instance: Optional[Union[BasquePig, DanishPig]] = None
else:
actual_instance: Any = None
any_of_schemas: List[str] = Field(default=Literal["BasquePig", "DanishPig"])
any_of_schemas: Set[str] = { "BasquePig", "DanishPig" }

model_config = {
"validate_assignment": True,
Expand Down
4 changes: 2 additions & 2 deletions samples/openapi3/client/petstore/python/petstore_api/models/color.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from typing import Any, List, Optional
from typing_extensions import Annotated
from pydantic import StrictStr, Field
from typing import Union, List, Optional, Dict
from typing import Union, List, Set, Optional, Dict
from typing_extensions import Literal, Self

COLOR_ONE_OF_SCHEMAS = ["List[int]", "str"]
Expand All @@ -35,7 +35,7 @@ class Color(BaseModel):
# data type: str
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.")
actual_instance: Optional[Union[List[int], str]] = None
one_of_schemas: List[str] = Field(default=Literal["List[int]", "str"])
one_of_schemas: Set[str] = { "List[int]", "str" }

model_config = ConfigDict(
validate_assignment=True,
Expand Down
4 changes: 2 additions & 2 deletions samples/openapi3/client/petstore/python/petstore_api/models/int_or_string.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from typing import Any, List, Optional
from typing_extensions import Annotated
from pydantic import StrictStr, Field
from typing import Union, List, Optional, Dict
from typing import Union, List, Set, Optional, Dict
from typing_extensions import Literal, Self

INTORSTRING_ONE_OF_SCHEMAS = ["int", "str"]
Expand All @@ -33,7 +33,7 @@ class IntOrString(BaseModel):
# data type: str
oneof_schema_2_validator: Optional[StrictStr] = None
actual_instance: Optional[Union[int, str]] = None
one_of_schemas: List[str] = Field(default=Literal["int", "str"])
one_of_schemas: Set[str] = { "int", "str" }

model_config = ConfigDict(
validate_assignment=True,
Expand Down
4 changes: 2 additions & 2 deletions samples/openapi3/client/petstore/python/petstore_api/models/one_of_enum_string.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from petstore_api.models.enum_string1 import EnumString1
from petstore_api.models.enum_string2 import EnumString2
from pydantic import StrictStr, Field
from typing import Union, List, Optional, Dict
from typing import Union, List, Set, Optional, Dict
from typing_extensions import Literal, Self

ONEOFENUMSTRING_ONE_OF_SCHEMAS = ["EnumString1", "EnumString2"]
Expand All @@ -34,7 +34,7 @@ class OneOfEnumString(BaseModel):
# data type: EnumString2
oneof_schema_2_validator: Optional[EnumString2] = None
actual_instance: Optional[Union[EnumString1, EnumString2]] = None
one_of_schemas: List[str] = Field(default=Literal["EnumString1", "EnumString2"])
one_of_schemas: Set[str] = { "EnumString1", "EnumString2" }

model_config = ConfigDict(
validate_assignment=True,
Expand Down
4 changes: 2 additions & 2 deletions samples/openapi3/client/petstore/python/petstore_api/models/pig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from petstore_api.models.basque_pig import BasquePig
from petstore_api.models.danish_pig import DanishPig
from pydantic import StrictStr, Field
from typing import Union, List, Optional, Dict
from typing import Union, List, Set, Optional, Dict
from typing_extensions import Literal, Self

PIG_ONE_OF_SCHEMAS = ["BasquePig", "DanishPig"]
Expand All @@ -34,7 +34,7 @@ class Pig(BaseModel):
# data type: DanishPig
oneof_schema_2_validator: Optional[DanishPig] = None
actual_instance: Optional[Union[BasquePig, DanishPig]] = None
one_of_schemas: List[str] = Field(default=Literal["BasquePig", "DanishPig"])
one_of_schemas: Set[str] = { "BasquePig", "DanishPig" }

model_config = ConfigDict(
validate_assignment=True,
Expand Down
4 changes: 2 additions & 2 deletions samples/openapi3/client/petstore/python/petstore_api/models/task_activity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from petstore_api.models.feeding import Feeding
from petstore_api.models.poop_cleaning import PoopCleaning
from pydantic import StrictStr, Field
from typing import Union, List, Optional, Dict
from typing import Union, List, Set, Optional, Dict
from typing_extensions import Literal, Self

TASKACTIVITY_ONE_OF_SCHEMAS = ["Bathing", "Feeding", "PoopCleaning"]
Expand All @@ -37,7 +37,7 @@ class TaskActivity(BaseModel):
# data type: Bathing
oneof_schema_3_validator: Optional[Bathing] = None
actual_instance: Optional[Union[Bathing, Feeding, PoopCleaning]] = None
one_of_schemas: List[str] = Field(default=Literal["Bathing", "Feeding", "PoopCleaning"])
one_of_schemas: Set[str] = { "Bathing", "Feeding", "PoopCleaning" }

model_config = ConfigDict(
validate_assignment=True,
Expand Down