diff --git a/services/sqlserverflex/oas_commit b/services/sqlserverflex/oas_commit index e3713dde3..b129c2291 100644 --- a/services/sqlserverflex/oas_commit +++ b/services/sqlserverflex/oas_commit @@ -1 +1 @@ -0e64886dd0847341800d7191ed193b75413be998 +98c11e0ee4834ddaaa474eccc437d234e6276a70 diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/api_client.py b/services/sqlserverflex/src/stackit/sqlserverflex/api_client.py index c423aefea..3113547a5 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/api_client.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/api_client.py @@ -67,6 +67,7 @@ class ApiClient: "date": datetime.date, "datetime": datetime.datetime, "decimal": decimal.Decimal, + "UUID": uuid.UUID, "object": object, } _pool = None @@ -266,7 +267,7 @@ def response_deserialize( response_text = None return_data = None try: - if response_type == "bytearray": + if response_type in ("bytearray", "bytes"): return_data = response_data.data elif response_type == "file": return_data = self.__deserialize_file(response_data) @@ -327,25 +328,20 @@ def sanitize_for_serialization(self, obj): return obj.isoformat() elif isinstance(obj, decimal.Decimal): return str(obj) - elif isinstance(obj, dict): - obj_dict = obj + return {key: self.sanitize_for_serialization(val) for key, val in obj.items()} + + # Convert model obj to dict except + # attributes `openapi_types`, `attribute_map` + # and attributes which value is not None. + # Convert attribute name to json key in + # model definition for request. + if hasattr(obj, "to_dict") and callable(getattr(obj, "to_dict")): + obj_dict = obj.to_dict() else: - # Convert model obj to dict except - # attributes `openapi_types`, `attribute_map` - # and attributes which value is not None. - # Convert attribute name to json key in - # model definition for request. - if hasattr(obj, "to_dict") and callable(getattr(obj, "to_dict")): # noqa: B009 - obj_dict = obj.to_dict() - else: - obj_dict = obj.__dict__ - - if isinstance(obj_dict, list): - # here we handle instances that can either be a list or something else, and only became a real list by calling to_dict() # noqa: E501 - return self.sanitize_for_serialization(obj_dict) + obj_dict = obj.__dict__ - return {key: self.sanitize_for_serialization(val) for key, val in obj_dict.items()} + return self.sanitize_for_serialization(obj_dict) def deserialize(self, response_text: str, response_type: str, content_type: Optional[str]): """Deserializes response into an object. @@ -418,6 +414,8 @@ def __deserialize(self, data, klass): return self.__deserialize_datetime(data) elif klass is decimal.Decimal: return decimal.Decimal(data) + elif klass is uuid.UUID: + return uuid.UUID(data) elif issubclass(klass, Enum): return self.__deserialize_enum(data, klass) else: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/acl.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/acl.py index 233126053..552e458a4 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/acl.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/acl.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -31,7 +32,8 @@ class ACL(BaseModel): __properties: ClassVar[List[str]] = ["items"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -42,8 +44,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/backup.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/backup.py index 6f912aec0..6f2bc7909 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/backup.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/backup.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -38,7 +39,8 @@ class Backup(BaseModel): __properties: ClassVar[List[str]] = ["endTime", "error", "id", "labels", "name", "options", "size", "startTime"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -49,8 +51,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/backup_list_backups_response_grouped.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/backup_list_backups_response_grouped.py index cead1a3b5..da633a685 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/backup_list_backups_response_grouped.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/backup_list_backups_response_grouped.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sqlserverflex.models.backup import Backup @@ -34,7 +35,8 @@ class BackupListBackupsResponseGrouped(BaseModel): __properties: ClassVar[List[str]] = ["backups", "name"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/create_database_payload.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/create_database_payload.py index 884ab96d3..e355d5311 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/create_database_payload.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/create_database_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sqlserverflex.models.database_documentation_create_database_request_options import ( @@ -36,7 +37,8 @@ class CreateDatabasePayload(BaseModel): __properties: ClassVar[List[str]] = ["name", "options"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -47,8 +49,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/create_database_response.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/create_database_response.py index 16a58ece7..d7ced1e77 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/create_database_response.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/create_database_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -31,7 +32,8 @@ class CreateDatabaseResponse(BaseModel): __properties: ClassVar[List[str]] = ["id"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -42,8 +44,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/create_instance_payload.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/create_instance_payload.py index cd4de47a0..661ba16c4 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/create_instance_payload.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/create_instance_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sqlserverflex.models.instance_documentation_acl import ( @@ -66,7 +67,8 @@ class CreateInstancePayload(BaseModel): ] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -77,8 +79,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/create_instance_response.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/create_instance_response.py index 1fb60f011..73d777d46 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/create_instance_response.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/create_instance_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -31,7 +32,8 @@ class CreateInstanceResponse(BaseModel): __properties: ClassVar[List[str]] = ["id"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -42,8 +44,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/create_user_payload.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/create_user_payload.py index dfa7bb9b3..1cbb53c1e 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/create_user_payload.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/create_user_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -33,7 +34,8 @@ class CreateUserPayload(BaseModel): __properties: ClassVar[List[str]] = ["default_database", "roles", "username"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -44,8 +46,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/create_user_response.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/create_user_response.py index b52d2287e..0ff82fad9 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/create_user_response.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/create_user_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sqlserverflex.models.single_user import SingleUser @@ -33,7 +34,8 @@ class CreateUserResponse(BaseModel): __properties: ClassVar[List[str]] = ["item"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -44,8 +46,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/data_point.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/data_point.py index d5968e81c..0112d748f 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/data_point.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/data_point.py @@ -25,6 +25,7 @@ StrictInt, StrictStr, ) +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -38,7 +39,8 @@ class DataPoint(BaseModel): __properties: ClassVar[List[str]] = ["timestamp", "value"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -49,8 +51,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/database.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/database.py index ef580dacb..0d2dfdb65 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/database.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/database.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -33,7 +34,8 @@ class Database(BaseModel): __properties: ClassVar[List[str]] = ["id", "name", "options"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -44,8 +46,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/database_documentation_create_database_request_options.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/database_documentation_create_database_request_options.py index 79e3ca3dc..e11b6137d 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/database_documentation_create_database_request_options.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/database_documentation_create_database_request_options.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -35,7 +36,8 @@ class DatabaseDocumentationCreateDatabaseRequestOptions(BaseModel): __properties: ClassVar[List[str]] = ["collation", "compatibilityLevel", "owner"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -46,8 +48,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/database_options.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/database_options.py index 9a18857b0..0db92d52f 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/database_options.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/database_options.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -37,7 +38,8 @@ class DatabaseOptions(BaseModel): __properties: ClassVar[List[str]] = ["collationName", "compatibilityLevel", "owner"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -48,8 +50,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/flavor.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/flavor.py index dbe47ca3a..c02c1540b 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/flavor.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/flavor.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -34,7 +35,8 @@ class Flavor(BaseModel): __properties: ClassVar[List[str]] = ["cpu", "description", "id", "memory"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/get_backup_response.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/get_backup_response.py index 5f0ec42eb..85bb2b585 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/get_backup_response.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/get_backup_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -42,7 +43,8 @@ class GetBackupResponse(BaseModel): __properties: ClassVar[List[str]] = ["endTime", "error", "id", "labels", "name", "options", "size", "startTime"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -53,8 +55,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/get_database_response.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/get_database_response.py index 9e51ccdc0..c6ef3b79d 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/get_database_response.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/get_database_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sqlserverflex.models.single_database import SingleDatabase @@ -33,7 +34,8 @@ class GetDatabaseResponse(BaseModel): __properties: ClassVar[List[str]] = ["database"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -44,8 +46,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/get_instance_response.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/get_instance_response.py index 5669108c5..07a98fec3 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/get_instance_response.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/get_instance_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sqlserverflex.models.instance import Instance @@ -33,7 +34,8 @@ class GetInstanceResponse(BaseModel): __properties: ClassVar[List[str]] = ["item"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -44,8 +46,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/get_user_response.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/get_user_response.py index 371316137..b303b3f17 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/get_user_response.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/get_user_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sqlserverflex.models.user_response_user import UserResponseUser @@ -33,7 +34,8 @@ class GetUserResponse(BaseModel): __properties: ClassVar[List[str]] = ["item"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -44,8 +46,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/host.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/host.py index f9af2fb08..7baaa5630 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/host.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/host.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sqlserverflex.models.host_metric import HostMetric @@ -34,7 +35,8 @@ class Host(BaseModel): __properties: ClassVar[List[str]] = ["hostMetrics", "id"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/host_metric.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/host_metric.py index 0b148248a..19366a03e 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/host_metric.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/host_metric.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sqlserverflex.models.data_point import DataPoint @@ -35,7 +36,8 @@ class HostMetric(BaseModel): __properties: ClassVar[List[str]] = ["datapoints", "name", "units"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -46,8 +48,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/instance.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/instance.py index b235a4e10..cb019f594 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/instance.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/instance.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sqlserverflex.models.acl import ACL @@ -55,7 +56,8 @@ class Instance(BaseModel): ] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -66,8 +68,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/instance_documentation_acl.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/instance_documentation_acl.py index 80c351379..862d6b23d 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/instance_documentation_acl.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/instance_documentation_acl.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -31,7 +32,8 @@ class InstanceDocumentationACL(BaseModel): __properties: ClassVar[List[str]] = ["items"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -42,8 +44,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/instance_documentation_options.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/instance_documentation_options.py index aa1bdacff..94eb2bdd7 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/instance_documentation_options.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/instance_documentation_options.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -36,7 +37,8 @@ class InstanceDocumentationOptions(BaseModel): __properties: ClassVar[List[str]] = ["edition", "retentionDays"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -47,8 +49,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/instance_documentation_storage.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/instance_documentation_storage.py index 1429b09ff..b8d4c32ac 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/instance_documentation_storage.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/instance_documentation_storage.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -34,7 +35,8 @@ class InstanceDocumentationStorage(BaseModel): __properties: ClassVar[List[str]] = ["class", "size"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/instance_error.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/instance_error.py index c17315409..794a66ce3 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/instance_error.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/instance_error.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sqlserverflex.models.type import Type @@ -36,7 +37,8 @@ class InstanceError(BaseModel): __properties: ClassVar[List[str]] = ["code", "fields", "message", "type"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -47,8 +49,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/instance_flavor_entry.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/instance_flavor_entry.py index 191cfd2ca..b4a1abf86 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/instance_flavor_entry.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/instance_flavor_entry.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -35,7 +36,8 @@ class InstanceFlavorEntry(BaseModel): __properties: ClassVar[List[str]] = ["categories", "cpu", "description", "id", "memory"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -46,8 +48,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/instance_list_instance.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/instance_list_instance.py index 9b7e11b74..61ff3bc59 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/instance_list_instance.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/instance_list_instance.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -33,7 +34,8 @@ class InstanceListInstance(BaseModel): __properties: ClassVar[List[str]] = ["id", "name", "status"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -44,8 +46,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/instance_list_user.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/instance_list_user.py index 8a396207d..53f11ccdd 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/instance_list_user.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/instance_list_user.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -32,7 +33,8 @@ class InstanceListUser(BaseModel): __properties: ClassVar[List[str]] = ["id", "username"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -43,8 +45,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/list_backups_response.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/list_backups_response.py index 7c1d6a20e..b442fda68 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/list_backups_response.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/list_backups_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sqlserverflex.models.backup_list_backups_response_grouped import ( @@ -35,7 +36,8 @@ class ListBackupsResponse(BaseModel): __properties: ClassVar[List[str]] = ["databases"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -46,8 +48,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/list_collations_response.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/list_collations_response.py index 867dcf05e..43b22edae 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/list_collations_response.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/list_collations_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sqlserverflex.models.mssql_database_collation import MssqlDatabaseCollation @@ -33,7 +34,8 @@ class ListCollationsResponse(BaseModel): __properties: ClassVar[List[str]] = ["collations"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -44,8 +46,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/list_compatibility_response.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/list_compatibility_response.py index 35526a045..f4f47d6cf 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/list_compatibility_response.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/list_compatibility_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sqlserverflex.models.mssql_database_compatibility import ( @@ -35,7 +36,8 @@ class ListCompatibilityResponse(BaseModel): __properties: ClassVar[List[str]] = ["compatibilities"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -46,8 +48,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/list_databases_response.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/list_databases_response.py index a5e8ef136..9da93a845 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/list_databases_response.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/list_databases_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sqlserverflex.models.database import Database @@ -33,7 +34,8 @@ class ListDatabasesResponse(BaseModel): __properties: ClassVar[List[str]] = ["databases"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -44,8 +46,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/list_flavors_response.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/list_flavors_response.py index 687444510..8a77d199e 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/list_flavors_response.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/list_flavors_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sqlserverflex.models.instance_flavor_entry import InstanceFlavorEntry @@ -33,7 +34,8 @@ class ListFlavorsResponse(BaseModel): __properties: ClassVar[List[str]] = ["flavors"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -44,8 +46,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/list_instances_response.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/list_instances_response.py index 493abbfdf..48365a8cb 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/list_instances_response.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/list_instances_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, StrictInt +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sqlserverflex.models.instance_list_instance import InstanceListInstance @@ -34,7 +35,8 @@ class ListInstancesResponse(BaseModel): __properties: ClassVar[List[str]] = ["count", "items"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/list_metrics_response.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/list_metrics_response.py index 1f2bc02b0..9760bad6c 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/list_metrics_response.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/list_metrics_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sqlserverflex.models.host import Host @@ -33,7 +34,8 @@ class ListMetricsResponse(BaseModel): __properties: ClassVar[List[str]] = ["hosts"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -44,8 +46,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/list_restore_jobs_response.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/list_restore_jobs_response.py index 39d2433c3..65e79a43f 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/list_restore_jobs_response.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/list_restore_jobs_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sqlserverflex.models.restore_running_restore import RestoreRunningRestore @@ -33,7 +34,8 @@ class ListRestoreJobsResponse(BaseModel): __properties: ClassVar[List[str]] = ["runningRestores"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -44,8 +46,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/list_roles_response.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/list_roles_response.py index 4cb47243f..790957120 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/list_roles_response.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/list_roles_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -31,7 +32,8 @@ class ListRolesResponse(BaseModel): __properties: ClassVar[List[str]] = ["roles"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -42,8 +44,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/list_storages_response.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/list_storages_response.py index 8d06af931..20d545456 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/list_storages_response.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/list_storages_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sqlserverflex.models.storage_range import StorageRange @@ -34,7 +35,8 @@ class ListStoragesResponse(BaseModel): __properties: ClassVar[List[str]] = ["storageClasses", "storageRange"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/list_users_response.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/list_users_response.py index 58bf780b8..faeea7510 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/list_users_response.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/list_users_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, StrictInt +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sqlserverflex.models.instance_list_user import InstanceListUser @@ -34,7 +35,8 @@ class ListUsersResponse(BaseModel): __properties: ClassVar[List[str]] = ["count", "items"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/list_versions_response.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/list_versions_response.py index 38ef02c7a..76687d45e 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/list_versions_response.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/list_versions_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -31,7 +32,8 @@ class ListVersionsResponse(BaseModel): __properties: ClassVar[List[str]] = ["versions"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -42,8 +44,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/mssql_database_collation.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/mssql_database_collation.py index 65ce2d35a..17e6a0716 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/mssql_database_collation.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/mssql_database_collation.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -32,7 +33,8 @@ class MssqlDatabaseCollation(BaseModel): __properties: ClassVar[List[str]] = ["collation_name", "description"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -43,8 +45,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/mssql_database_compatibility.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/mssql_database_compatibility.py index 835050833..e704b4271 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/mssql_database_compatibility.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/mssql_database_compatibility.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -32,7 +33,8 @@ class MssqlDatabaseCompatibility(BaseModel): __properties: ClassVar[List[str]] = ["compatibility_level", "description"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -43,8 +45,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/partial_update_instance_payload.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/partial_update_instance_payload.py index a2593fdcc..a4fbfc5d2 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/partial_update_instance_payload.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/partial_update_instance_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sqlserverflex.models.instance_documentation_acl import ( @@ -47,7 +48,8 @@ class PartialUpdateInstancePayload(BaseModel): __properties: ClassVar[List[str]] = ["acl", "backupSchedule", "flavorId", "labels", "name", "version"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -58,8 +60,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/reset_user_response.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/reset_user_response.py index 8b206c14a..74f706024 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/reset_user_response.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/reset_user_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sqlserverflex.models.single_user import SingleUser @@ -33,7 +34,8 @@ class ResetUserResponse(BaseModel): __properties: ClassVar[List[str]] = ["item"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -44,8 +46,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/restore_running_restore.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/restore_running_restore.py index 552d4c679..1519e5c3e 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/restore_running_restore.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/restore_running_restore.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -41,7 +42,8 @@ class RestoreRunningRestore(BaseModel): ] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -52,8 +54,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/single_database.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/single_database.py index e76c0703e..e42d01a5e 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/single_database.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/single_database.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sqlserverflex.models.database_options import DatabaseOptions @@ -35,7 +36,8 @@ class SingleDatabase(BaseModel): __properties: ClassVar[List[str]] = ["id", "name", "options"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -46,8 +48,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/single_user.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/single_user.py index 04ee99c2c..5d83d724d 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/single_user.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/single_user.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -47,7 +48,8 @@ class SingleUser(BaseModel): ] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -58,8 +60,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/storage.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/storage.py index 84853e48d..8f1d2ab10 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/storage.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/storage.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -32,7 +33,8 @@ class Storage(BaseModel): __properties: ClassVar[List[str]] = ["class", "size"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -43,8 +45,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/storage_range.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/storage_range.py index 75885acf7..ab1ceff7d 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/storage_range.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/storage_range.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, StrictInt +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -32,7 +33,8 @@ class StorageRange(BaseModel): __properties: ClassVar[List[str]] = ["max", "min"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -43,8 +45,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/trigger_database_restore_payload.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/trigger_database_restore_payload.py index 147fd2142..6519725f1 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/trigger_database_restore_payload.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/trigger_database_restore_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -34,7 +35,8 @@ class TriggerDatabaseRestorePayload(BaseModel): __properties: ClassVar[List[str]] = ["name", "restoreDateTime"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/update_instance_payload.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/update_instance_payload.py index fd437e3ef..580ac6633 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/update_instance_payload.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/update_instance_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sqlserverflex.models.instance_documentation_acl import ( @@ -45,7 +46,8 @@ class UpdateInstancePayload(BaseModel): __properties: ClassVar[List[str]] = ["acl", "backupSchedule", "flavorId", "labels", "name", "version"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -56,8 +58,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/update_instance_response.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/update_instance_response.py index ab276ffc5..f7782e5cd 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/update_instance_response.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/update_instance_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sqlserverflex.models.instance import Instance @@ -33,7 +34,8 @@ class UpdateInstanceResponse(BaseModel): __properties: ClassVar[List[str]] = ["item"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -44,8 +46,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/user.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/user.py index 070629c47..e8864ebc7 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/user.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/user.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -38,7 +39,8 @@ class User(BaseModel): __properties: ClassVar[List[str]] = ["database", "host", "id", "password", "port", "roles", "uri", "username"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -49,8 +51,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/sqlserverflex/src/stackit/sqlserverflex/models/user_response_user.py b/services/sqlserverflex/src/stackit/sqlserverflex/models/user_response_user.py index b5b6a1960..97b70f574 100644 --- a/services/sqlserverflex/src/stackit/sqlserverflex/models/user_response_user.py +++ b/services/sqlserverflex/src/stackit/sqlserverflex/models/user_response_user.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -36,7 +37,8 @@ class UserResponseUser(BaseModel): __properties: ClassVar[List[str]] = ["default_database", "host", "id", "port", "roles", "username"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -47,8 +49,7 @@ def to_str(self) -> str: def to_json(self) -> str: """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: