From 8f44330dd48a86db7b4743271de51cd652aa194b Mon Sep 17 00:00:00 2001 From: SDK Generator Bot Date: Mon, 11 May 2026 10:19:04 +0000 Subject: [PATCH] Generate sfs --- services/sfs/oas_commit | 2 +- services/sfs/src/stackit/sfs/api_client.py | 32 +++++++++---------- .../models/create_resource_pool_payload.py | 7 ++-- .../models/create_resource_pool_response.py | 7 ++-- .../create_resource_pool_snapshot_payload.py | 7 ++-- .../create_resource_pool_snapshot_response.py | 7 ++-- .../create_share_export_policy_payload.py | 7 ++-- ...create_share_export_policy_request_rule.py | 7 ++-- .../create_share_export_policy_response.py | 7 ++-- .../sfs/models/create_share_payload.py | 7 ++-- .../sfs/models/create_share_response.py | 7 ++-- .../sfs/models/enable_lock_response.py | 7 ++-- services/sfs/src/stackit/sfs/models/error.py | 7 ++-- .../stackit/sfs/models/get_lock_response.py | 7 ++-- .../sfs/models/get_resource_pool_response.py | 7 ++-- .../get_resource_pool_snapshot_response.py | 7 ++-- .../sfs/models/get_schedule_response.py | 7 ++-- .../get_share_export_policy_response.py | 7 ++-- .../stackit/sfs/models/get_share_response.py | 7 ++-- .../models/get_snapshot_policy_response.py | 7 ++-- .../stackit/sfs/models/google_protobuf_any.py | 7 ++-- .../list_performance_classes_response.py | 7 ++-- .../list_resource_pool_snapshots_response.py | 7 ++-- .../models/list_resource_pools_response.py | 7 ++-- .../sfs/models/list_schedules_response.py | 7 ++-- .../list_share_export_policies_response.py | 7 ++-- .../sfs/models/list_shares_response.py | 7 ++-- .../models/list_snapshot_policies_response.py | 7 ++-- .../stackit/sfs/models/performance_class.py | 7 ++-- .../src/stackit/sfs/models/resource_pool.py | 7 ++-- .../models/resource_pool_performance_class.py | 7 ++-- .../sfs/models/resource_pool_snapshot.py | 7 ++-- .../models/resource_pool_snapshot_policy.py | 7 ++-- .../stackit/sfs/models/resource_pool_space.py | 7 ++-- .../sfs/src/stackit/sfs/models/schedule.py | 7 ++-- services/sfs/src/stackit/sfs/models/share.py | 7 ++-- .../stackit/sfs/models/share_export_policy.py | 7 ++-- .../sfs/models/share_export_policy_rule.py | 7 ++-- .../src/stackit/sfs/models/snapshot_policy.py | 7 ++-- .../sfs/models/snapshot_policy_schedule.py | 7 ++-- ...napshot_policy_snapshot_policy_schedule.py | 7 ++-- services/sfs/src/stackit/sfs/models/status.py | 7 ++-- .../models/update_resource_pool_payload.py | 7 ++-- .../models/update_resource_pool_response.py | 7 ++-- .../update_resource_pool_snapshot_payload.py | 7 ++-- .../update_resource_pool_snapshot_response.py | 7 ++-- .../update_share_export_policy_body_rule.py | 7 ++-- .../update_share_export_policy_payload.py | 7 ++-- .../update_share_export_policy_response.py | 7 ++-- .../sfs/models/update_share_payload.py | 7 ++-- .../sfs/models/update_share_response.py | 7 ++-- .../stackit/sfs/models/validation_error.py | 7 ++-- .../sfs/models/validation_error_field.py | 7 ++-- 53 files changed, 220 insertions(+), 171 deletions(-) diff --git a/services/sfs/oas_commit b/services/sfs/oas_commit index 7d5fc0bc0..b129c2291 100644 --- a/services/sfs/oas_commit +++ b/services/sfs/oas_commit @@ -1 +1 @@ -a896a71ffc1c1152f63b40a0194ac461ce179d6c +98c11e0ee4834ddaaa474eccc437d234e6276a70 diff --git a/services/sfs/src/stackit/sfs/api_client.py b/services/sfs/src/stackit/sfs/api_client.py index 7fb861461..b1e5416d9 100644 --- a/services/sfs/src/stackit/sfs/api_client.py +++ b/services/sfs/src/stackit/sfs/api_client.py @@ -66,6 +66,7 @@ class ApiClient: "date": datetime.date, "datetime": datetime.datetime, "decimal": decimal.Decimal, + "UUID": uuid.UUID, "object": object, } _pool = None @@ -265,7 +266,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) @@ -326,25 +327,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. @@ -417,6 +413,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/sfs/src/stackit/sfs/models/create_resource_pool_payload.py b/services/sfs/src/stackit/sfs/models/create_resource_pool_payload.py index 138038474..14f3f1501 100644 --- a/services/sfs/src/stackit/sfs/models/create_resource_pool_payload.py +++ b/services/sfs/src/stackit/sfs/models/create_resource_pool_payload.py @@ -25,6 +25,7 @@ StrictInt, StrictStr, ) +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -67,7 +68,8 @@ class CreateResourcePoolPayload(BaseModel): ] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -78,8 +80,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/sfs/src/stackit/sfs/models/create_resource_pool_response.py b/services/sfs/src/stackit/sfs/models/create_resource_pool_response.py index 772dfc2ff..04fa8e631 100644 --- a/services/sfs/src/stackit/sfs/models/create_resource_pool_response.py +++ b/services/sfs/src/stackit/sfs/models/create_resource_pool_response.py @@ -18,6 +18,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.sfs.models.resource_pool import ResourcePool @@ -34,7 +35,8 @@ class CreateResourcePoolResponse(BaseModel): __properties: ClassVar[List[str]] = ["resourcePool"] 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/sfs/src/stackit/sfs/models/create_resource_pool_snapshot_payload.py b/services/sfs/src/stackit/sfs/models/create_resource_pool_snapshot_payload.py index 6acfd64a1..bb291ebce 100644 --- a/services/sfs/src/stackit/sfs/models/create_resource_pool_snapshot_payload.py +++ b/services/sfs/src/stackit/sfs/models/create_resource_pool_snapshot_payload.py @@ -18,6 +18,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 CreateResourcePoolSnapshotPayload(BaseModel): __properties: ClassVar[List[str]] = ["comment", "name", "snaplockRetentionHours"] 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/sfs/src/stackit/sfs/models/create_resource_pool_snapshot_response.py b/services/sfs/src/stackit/sfs/models/create_resource_pool_snapshot_response.py index 9eddbf977..224a90e11 100644 --- a/services/sfs/src/stackit/sfs/models/create_resource_pool_snapshot_response.py +++ b/services/sfs/src/stackit/sfs/models/create_resource_pool_snapshot_response.py @@ -18,6 +18,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.sfs.models.resource_pool_snapshot import ResourcePoolSnapshot @@ -34,7 +35,8 @@ class CreateResourcePoolSnapshotResponse(BaseModel): __properties: ClassVar[List[str]] = ["resourcePoolSnapshot"] 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/sfs/src/stackit/sfs/models/create_share_export_policy_payload.py b/services/sfs/src/stackit/sfs/models/create_share_export_policy_payload.py index ee63de25b..e6ceee2d5 100644 --- a/services/sfs/src/stackit/sfs/models/create_share_export_policy_payload.py +++ b/services/sfs/src/stackit/sfs/models/create_share_export_policy_payload.py @@ -18,6 +18,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.sfs.models.create_share_export_policy_request_rule import ( @@ -42,7 +43,8 @@ class CreateShareExportPolicyPayload(BaseModel): __properties: ClassVar[List[str]] = ["labels", "name", "rules"] 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/sfs/src/stackit/sfs/models/create_share_export_policy_request_rule.py b/services/sfs/src/stackit/sfs/models/create_share_export_policy_request_rule.py index 7a60bf1fb..7780c9f8d 100644 --- a/services/sfs/src/stackit/sfs/models/create_share_export_policy_request_rule.py +++ b/services/sfs/src/stackit/sfs/models/create_share_export_policy_request_rule.py @@ -25,6 +25,7 @@ StrictInt, StrictStr, ) +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -59,7 +60,8 @@ class CreateShareExportPolicyRequestRule(BaseModel): __properties: ClassVar[List[str]] = ["description", "ipAcl", "order", "readOnly", "setUuid", "superUser"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -70,8 +72,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/sfs/src/stackit/sfs/models/create_share_export_policy_response.py b/services/sfs/src/stackit/sfs/models/create_share_export_policy_response.py index 8806c4571..f0e8eabc5 100644 --- a/services/sfs/src/stackit/sfs/models/create_share_export_policy_response.py +++ b/services/sfs/src/stackit/sfs/models/create_share_export_policy_response.py @@ -18,6 +18,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.sfs.models.share_export_policy import ShareExportPolicy @@ -34,7 +35,8 @@ class CreateShareExportPolicyResponse(BaseModel): __properties: ClassVar[List[str]] = ["shareExportPolicy"] 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/sfs/src/stackit/sfs/models/create_share_payload.py b/services/sfs/src/stackit/sfs/models/create_share_payload.py index 12c029c35..2ec2cb147 100644 --- a/services/sfs/src/stackit/sfs/models/create_share_payload.py +++ b/services/sfs/src/stackit/sfs/models/create_share_payload.py @@ -18,6 +18,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 @@ -43,7 +44,8 @@ class CreateSharePayload(BaseModel): __properties: ClassVar[List[str]] = ["exportPolicyName", "labels", "name", "spaceHardLimitGigabytes"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -54,8 +56,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/sfs/src/stackit/sfs/models/create_share_response.py b/services/sfs/src/stackit/sfs/models/create_share_response.py index c1e797e7a..cde9cf3b2 100644 --- a/services/sfs/src/stackit/sfs/models/create_share_response.py +++ b/services/sfs/src/stackit/sfs/models/create_share_response.py @@ -18,6 +18,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.sfs.models.share import Share @@ -32,7 +33,8 @@ class CreateShareResponse(BaseModel): __properties: ClassVar[List[str]] = ["share"] 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/sfs/src/stackit/sfs/models/enable_lock_response.py b/services/sfs/src/stackit/sfs/models/enable_lock_response.py index 80b7b3b22..a5a7b5b0a 100644 --- a/services/sfs/src/stackit/sfs/models/enable_lock_response.py +++ b/services/sfs/src/stackit/sfs/models/enable_lock_response.py @@ -18,6 +18,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 @@ -30,7 +31,8 @@ class EnableLockResponse(BaseModel): __properties: ClassVar[List[str]] = ["lockId"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -41,8 +43,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/sfs/src/stackit/sfs/models/error.py b/services/sfs/src/stackit/sfs/models/error.py index 5c10569ff..19ffa9cce 100644 --- a/services/sfs/src/stackit/sfs/models/error.py +++ b/services/sfs/src/stackit/sfs/models/error.py @@ -18,6 +18,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 Error(BaseModel): __properties: ClassVar[List[str]] = ["error_description", "title", "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/sfs/src/stackit/sfs/models/get_lock_response.py b/services/sfs/src/stackit/sfs/models/get_lock_response.py index cdf302121..9faab3e0a 100644 --- a/services/sfs/src/stackit/sfs/models/get_lock_response.py +++ b/services/sfs/src/stackit/sfs/models/get_lock_response.py @@ -18,6 +18,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 @@ -30,7 +31,8 @@ class GetLockResponse(BaseModel): __properties: ClassVar[List[str]] = ["lockId"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -41,8 +43,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/sfs/src/stackit/sfs/models/get_resource_pool_response.py b/services/sfs/src/stackit/sfs/models/get_resource_pool_response.py index 0752294f8..c93de4ea3 100644 --- a/services/sfs/src/stackit/sfs/models/get_resource_pool_response.py +++ b/services/sfs/src/stackit/sfs/models/get_resource_pool_response.py @@ -18,6 +18,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.sfs.models.resource_pool import ResourcePool @@ -32,7 +33,8 @@ class GetResourcePoolResponse(BaseModel): __properties: ClassVar[List[str]] = ["resourcePool"] 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/sfs/src/stackit/sfs/models/get_resource_pool_snapshot_response.py b/services/sfs/src/stackit/sfs/models/get_resource_pool_snapshot_response.py index f041cecb9..6b9389c11 100644 --- a/services/sfs/src/stackit/sfs/models/get_resource_pool_snapshot_response.py +++ b/services/sfs/src/stackit/sfs/models/get_resource_pool_snapshot_response.py @@ -18,6 +18,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.sfs.models.resource_pool_snapshot import ResourcePoolSnapshot @@ -34,7 +35,8 @@ class GetResourcePoolSnapshotResponse(BaseModel): __properties: ClassVar[List[str]] = ["resourcePoolSnapshot"] 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/sfs/src/stackit/sfs/models/get_schedule_response.py b/services/sfs/src/stackit/sfs/models/get_schedule_response.py index 5e4d8f157..1027f8411 100644 --- a/services/sfs/src/stackit/sfs/models/get_schedule_response.py +++ b/services/sfs/src/stackit/sfs/models/get_schedule_response.py @@ -18,6 +18,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.sfs.models.schedule import Schedule @@ -32,7 +33,8 @@ class GetScheduleResponse(BaseModel): __properties: ClassVar[List[str]] = ["schedule"] 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/sfs/src/stackit/sfs/models/get_share_export_policy_response.py b/services/sfs/src/stackit/sfs/models/get_share_export_policy_response.py index 0e87af86b..412e5d4a1 100644 --- a/services/sfs/src/stackit/sfs/models/get_share_export_policy_response.py +++ b/services/sfs/src/stackit/sfs/models/get_share_export_policy_response.py @@ -18,6 +18,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.sfs.models.share_export_policy import ShareExportPolicy @@ -34,7 +35,8 @@ class GetShareExportPolicyResponse(BaseModel): __properties: ClassVar[List[str]] = ["shareExportPolicy"] 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/sfs/src/stackit/sfs/models/get_share_response.py b/services/sfs/src/stackit/sfs/models/get_share_response.py index 6df7c9fff..594338f2c 100644 --- a/services/sfs/src/stackit/sfs/models/get_share_response.py +++ b/services/sfs/src/stackit/sfs/models/get_share_response.py @@ -18,6 +18,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.sfs.models.share import Share @@ -32,7 +33,8 @@ class GetShareResponse(BaseModel): __properties: ClassVar[List[str]] = ["share"] 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/sfs/src/stackit/sfs/models/get_snapshot_policy_response.py b/services/sfs/src/stackit/sfs/models/get_snapshot_policy_response.py index 3bc9d30a3..a991086e3 100644 --- a/services/sfs/src/stackit/sfs/models/get_snapshot_policy_response.py +++ b/services/sfs/src/stackit/sfs/models/get_snapshot_policy_response.py @@ -18,6 +18,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.sfs.models.snapshot_policy import SnapshotPolicy @@ -34,7 +35,8 @@ class GetSnapshotPolicyResponse(BaseModel): __properties: ClassVar[List[str]] = ["snapshotPolicy"] 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/sfs/src/stackit/sfs/models/google_protobuf_any.py b/services/sfs/src/stackit/sfs/models/google_protobuf_any.py index 0e1fa318c..ab842e1a5 100644 --- a/services/sfs/src/stackit/sfs/models/google_protobuf_any.py +++ b/services/sfs/src/stackit/sfs/models/google_protobuf_any.py @@ -18,6 +18,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 GoogleProtobufAny(BaseModel): __properties: ClassVar[List[str]] = ["@type"] 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/sfs/src/stackit/sfs/models/list_performance_classes_response.py b/services/sfs/src/stackit/sfs/models/list_performance_classes_response.py index 0fd72e378..0eea95397 100644 --- a/services/sfs/src/stackit/sfs/models/list_performance_classes_response.py +++ b/services/sfs/src/stackit/sfs/models/list_performance_classes_response.py @@ -18,6 +18,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.sfs.models.performance_class import PerformanceClass @@ -34,7 +35,8 @@ class ListPerformanceClassesResponse(BaseModel): __properties: ClassVar[List[str]] = ["performanceClasses"] 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/sfs/src/stackit/sfs/models/list_resource_pool_snapshots_response.py b/services/sfs/src/stackit/sfs/models/list_resource_pool_snapshots_response.py index e7354a760..b1f79b3c9 100644 --- a/services/sfs/src/stackit/sfs/models/list_resource_pool_snapshots_response.py +++ b/services/sfs/src/stackit/sfs/models/list_resource_pool_snapshots_response.py @@ -18,6 +18,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.sfs.models.resource_pool_snapshot import ResourcePoolSnapshot @@ -34,7 +35,8 @@ class ListResourcePoolSnapshotsResponse(BaseModel): __properties: ClassVar[List[str]] = ["resourcePoolSnapshots"] 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/sfs/src/stackit/sfs/models/list_resource_pools_response.py b/services/sfs/src/stackit/sfs/models/list_resource_pools_response.py index df4f7025e..ec41d50fb 100644 --- a/services/sfs/src/stackit/sfs/models/list_resource_pools_response.py +++ b/services/sfs/src/stackit/sfs/models/list_resource_pools_response.py @@ -18,6 +18,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.sfs.models.resource_pool import ResourcePool @@ -34,7 +35,8 @@ class ListResourcePoolsResponse(BaseModel): __properties: ClassVar[List[str]] = ["resourcePools"] 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/sfs/src/stackit/sfs/models/list_schedules_response.py b/services/sfs/src/stackit/sfs/models/list_schedules_response.py index 595a22ace..44540aa12 100644 --- a/services/sfs/src/stackit/sfs/models/list_schedules_response.py +++ b/services/sfs/src/stackit/sfs/models/list_schedules_response.py @@ -18,6 +18,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.sfs.models.schedule import Schedule @@ -32,7 +33,8 @@ class ListSchedulesResponse(BaseModel): __properties: ClassVar[List[str]] = ["schedules"] 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/sfs/src/stackit/sfs/models/list_share_export_policies_response.py b/services/sfs/src/stackit/sfs/models/list_share_export_policies_response.py index cf1f04e05..e8d11d7b1 100644 --- a/services/sfs/src/stackit/sfs/models/list_share_export_policies_response.py +++ b/services/sfs/src/stackit/sfs/models/list_share_export_policies_response.py @@ -18,6 +18,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.sfs.models.share_export_policy import ShareExportPolicy @@ -34,7 +35,8 @@ class ListShareExportPoliciesResponse(BaseModel): __properties: ClassVar[List[str]] = ["shareExportPolicies"] 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/sfs/src/stackit/sfs/models/list_shares_response.py b/services/sfs/src/stackit/sfs/models/list_shares_response.py index ec470338f..c3a462c71 100644 --- a/services/sfs/src/stackit/sfs/models/list_shares_response.py +++ b/services/sfs/src/stackit/sfs/models/list_shares_response.py @@ -18,6 +18,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.sfs.models.share import Share @@ -32,7 +33,8 @@ class ListSharesResponse(BaseModel): __properties: ClassVar[List[str]] = ["shares"] 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/sfs/src/stackit/sfs/models/list_snapshot_policies_response.py b/services/sfs/src/stackit/sfs/models/list_snapshot_policies_response.py index ef09717e9..a4b1e8ee4 100644 --- a/services/sfs/src/stackit/sfs/models/list_snapshot_policies_response.py +++ b/services/sfs/src/stackit/sfs/models/list_snapshot_policies_response.py @@ -18,6 +18,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.sfs.models.snapshot_policy import SnapshotPolicy @@ -34,7 +35,8 @@ class ListSnapshotPoliciesResponse(BaseModel): __properties: ClassVar[List[str]] = ["snapshotPolicies"] 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/sfs/src/stackit/sfs/models/performance_class.py b/services/sfs/src/stackit/sfs/models/performance_class.py index 0908a9dea..b08ae2401 100644 --- a/services/sfs/src/stackit/sfs/models/performance_class.py +++ b/services/sfs/src/stackit/sfs/models/performance_class.py @@ -18,6 +18,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 PerformanceClass(BaseModel): __properties: ClassVar[List[str]] = ["iops", "name", "throughput"] 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/sfs/src/stackit/sfs/models/resource_pool.py b/services/sfs/src/stackit/sfs/models/resource_pool.py index 8c1b2f3cc..f4ee10191 100644 --- a/services/sfs/src/stackit/sfs/models/resource_pool.py +++ b/services/sfs/src/stackit/sfs/models/resource_pool.py @@ -28,6 +28,7 @@ StrictStr, field_validator, ) +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sfs.models.resource_pool_performance_class import ( @@ -144,7 +145,8 @@ def size_reducible_at_change_year_zero_to_one(cls, value): return value model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -155,8 +157,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/sfs/src/stackit/sfs/models/resource_pool_performance_class.py b/services/sfs/src/stackit/sfs/models/resource_pool_performance_class.py index 1cd0e593a..aef64747c 100644 --- a/services/sfs/src/stackit/sfs/models/resource_pool_performance_class.py +++ b/services/sfs/src/stackit/sfs/models/resource_pool_performance_class.py @@ -18,6 +18,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 @@ -36,7 +37,8 @@ class ResourcePoolPerformanceClass(BaseModel): __properties: ClassVar[List[str]] = ["name", "peakIops", "throughput"] 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/sfs/src/stackit/sfs/models/resource_pool_snapshot.py b/services/sfs/src/stackit/sfs/models/resource_pool_snapshot.py index e395a6488..835e5e53d 100644 --- a/services/sfs/src/stackit/sfs/models/resource_pool_snapshot.py +++ b/services/sfs/src/stackit/sfs/models/resource_pool_snapshot.py @@ -20,6 +20,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -90,7 +91,8 @@ def snaplock_expiry_time_change_year_zero_to_one(cls, value): return value model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -101,8 +103,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/sfs/src/stackit/sfs/models/resource_pool_snapshot_policy.py b/services/sfs/src/stackit/sfs/models/resource_pool_snapshot_policy.py index 33aab6217..ed3057dc6 100644 --- a/services/sfs/src/stackit/sfs/models/resource_pool_snapshot_policy.py +++ b/services/sfs/src/stackit/sfs/models/resource_pool_snapshot_policy.py @@ -18,6 +18,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 ResourcePoolSnapshotPolicy(BaseModel): __properties: ClassVar[List[str]] = ["id", "name"] 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/sfs/src/stackit/sfs/models/resource_pool_space.py b/services/sfs/src/stackit/sfs/models/resource_pool_space.py index 85b67770e..ea2fe2d68 100644 --- a/services/sfs/src/stackit/sfs/models/resource_pool_space.py +++ b/services/sfs/src/stackit/sfs/models/resource_pool_space.py @@ -24,6 +24,7 @@ StrictFloat, StrictInt, ) +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -58,7 +59,8 @@ class ResourcePoolSpace(BaseModel): ] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -69,8 +71,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/sfs/src/stackit/sfs/models/schedule.py b/services/sfs/src/stackit/sfs/models/schedule.py index 3c7e08d64..9ad345bc4 100644 --- a/services/sfs/src/stackit/sfs/models/schedule.py +++ b/services/sfs/src/stackit/sfs/models/schedule.py @@ -20,6 +20,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -50,7 +51,8 @@ def created_at_change_year_zero_to_one(cls, value): return value model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -61,8 +63,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/sfs/src/stackit/sfs/models/share.py b/services/sfs/src/stackit/sfs/models/share.py index 4ed6f38ad..fe92636f3 100644 --- a/services/sfs/src/stackit/sfs/models/share.py +++ b/services/sfs/src/stackit/sfs/models/share.py @@ -20,6 +20,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sfs.models.share_export_policy import ShareExportPolicy @@ -79,7 +80,8 @@ def created_at_change_year_zero_to_one(cls, value): return value model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -90,8 +92,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/sfs/src/stackit/sfs/models/share_export_policy.py b/services/sfs/src/stackit/sfs/models/share_export_policy.py index 36863e58f..26b817a03 100644 --- a/services/sfs/src/stackit/sfs/models/share_export_policy.py +++ b/services/sfs/src/stackit/sfs/models/share_export_policy.py @@ -20,6 +20,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sfs.models.share_export_policy_rule import ShareExportPolicyRule @@ -60,7 +61,8 @@ def created_at_change_year_zero_to_one(cls, value): return value model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -71,8 +73,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/sfs/src/stackit/sfs/models/share_export_policy_rule.py b/services/sfs/src/stackit/sfs/models/share_export_policy_rule.py index 63f7bbfac..06a95c665 100644 --- a/services/sfs/src/stackit/sfs/models/share_export_policy_rule.py +++ b/services/sfs/src/stackit/sfs/models/share_export_policy_rule.py @@ -28,6 +28,7 @@ StrictStr, field_validator, ) +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -86,7 +87,8 @@ def created_at_change_year_zero_to_one(cls, value): return value model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -97,8 +99,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/sfs/src/stackit/sfs/models/snapshot_policy.py b/services/sfs/src/stackit/sfs/models/snapshot_policy.py index 6853d5f04..fa9a133a1 100644 --- a/services/sfs/src/stackit/sfs/models/snapshot_policy.py +++ b/services/sfs/src/stackit/sfs/models/snapshot_policy.py @@ -27,6 +27,7 @@ StrictStr, field_validator, ) +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.sfs.models.snapshot_policy_schedule import SnapshotPolicySchedule @@ -75,7 +76,8 @@ def created_at_change_year_zero_to_one(cls, value): return value model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -86,8 +88,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/sfs/src/stackit/sfs/models/snapshot_policy_schedule.py b/services/sfs/src/stackit/sfs/models/snapshot_policy_schedule.py index 0a4284066..f8ab60a71 100644 --- a/services/sfs/src/stackit/sfs/models/snapshot_policy_schedule.py +++ b/services/sfs/src/stackit/sfs/models/snapshot_policy_schedule.py @@ -18,6 +18,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 @@ -40,7 +41,8 @@ class SnapshotPolicySchedule(BaseModel): __properties: ClassVar[List[str]] = ["count", "interval", "prefix", "retentionPeriod", "scheduleId"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -51,8 +53,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/sfs/src/stackit/sfs/models/snapshot_policy_snapshot_policy_schedule.py b/services/sfs/src/stackit/sfs/models/snapshot_policy_snapshot_policy_schedule.py index d4706545d..3c71592c8 100644 --- a/services/sfs/src/stackit/sfs/models/snapshot_policy_snapshot_policy_schedule.py +++ b/services/sfs/src/stackit/sfs/models/snapshot_policy_snapshot_policy_schedule.py @@ -20,6 +20,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -65,7 +66,8 @@ def created_at_change_year_zero_to_one(cls, value): return value model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -76,8 +78,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/sfs/src/stackit/sfs/models/status.py b/services/sfs/src/stackit/sfs/models/status.py index 98da8f1b5..06b30e607 100644 --- a/services/sfs/src/stackit/sfs/models/status.py +++ b/services/sfs/src/stackit/sfs/models/status.py @@ -18,6 +18,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.sfs.models.google_protobuf_any import GoogleProtobufAny @@ -43,7 +44,8 @@ class Status(BaseModel): __properties: ClassVar[List[str]] = ["code", "details", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -54,8 +56,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/sfs/src/stackit/sfs/models/update_resource_pool_payload.py b/services/sfs/src/stackit/sfs/models/update_resource_pool_payload.py index 54ccbc930..2f31305eb 100644 --- a/services/sfs/src/stackit/sfs/models/update_resource_pool_payload.py +++ b/services/sfs/src/stackit/sfs/models/update_resource_pool_payload.py @@ -25,6 +25,7 @@ StrictInt, StrictStr, ) +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -68,7 +69,8 @@ class UpdateResourcePoolPayload(BaseModel): ] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -79,8 +81,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/sfs/src/stackit/sfs/models/update_resource_pool_response.py b/services/sfs/src/stackit/sfs/models/update_resource_pool_response.py index 455bea7aa..bef5209fb 100644 --- a/services/sfs/src/stackit/sfs/models/update_resource_pool_response.py +++ b/services/sfs/src/stackit/sfs/models/update_resource_pool_response.py @@ -18,6 +18,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.sfs.models.resource_pool import ResourcePool @@ -34,7 +35,8 @@ class UpdateResourcePoolResponse(BaseModel): __properties: ClassVar[List[str]] = ["resourcePool"] 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/sfs/src/stackit/sfs/models/update_resource_pool_snapshot_payload.py b/services/sfs/src/stackit/sfs/models/update_resource_pool_snapshot_payload.py index bd7f1e583..a2b80daf7 100644 --- a/services/sfs/src/stackit/sfs/models/update_resource_pool_snapshot_payload.py +++ b/services/sfs/src/stackit/sfs/models/update_resource_pool_snapshot_payload.py @@ -18,6 +18,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 UpdateResourcePoolSnapshotPayload(BaseModel): __properties: ClassVar[List[str]] = ["comment", "name"] 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/sfs/src/stackit/sfs/models/update_resource_pool_snapshot_response.py b/services/sfs/src/stackit/sfs/models/update_resource_pool_snapshot_response.py index 1120d7543..5e3139dd4 100644 --- a/services/sfs/src/stackit/sfs/models/update_resource_pool_snapshot_response.py +++ b/services/sfs/src/stackit/sfs/models/update_resource_pool_snapshot_response.py @@ -18,6 +18,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.sfs.models.resource_pool_snapshot import ResourcePoolSnapshot @@ -34,7 +35,8 @@ class UpdateResourcePoolSnapshotResponse(BaseModel): __properties: ClassVar[List[str]] = ["resourcePoolSnapshot"] 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/sfs/src/stackit/sfs/models/update_share_export_policy_body_rule.py b/services/sfs/src/stackit/sfs/models/update_share_export_policy_body_rule.py index d9bf536c0..2bb12c1ca 100644 --- a/services/sfs/src/stackit/sfs/models/update_share_export_policy_body_rule.py +++ b/services/sfs/src/stackit/sfs/models/update_share_export_policy_body_rule.py @@ -25,6 +25,7 @@ StrictInt, StrictStr, ) +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -59,7 +60,8 @@ class UpdateShareExportPolicyBodyRule(BaseModel): __properties: ClassVar[List[str]] = ["description", "ipAcl", "order", "readOnly", "setUuid", "superUser"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -70,8 +72,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/sfs/src/stackit/sfs/models/update_share_export_policy_payload.py b/services/sfs/src/stackit/sfs/models/update_share_export_policy_payload.py index a00e80860..0c509c115 100644 --- a/services/sfs/src/stackit/sfs/models/update_share_export_policy_payload.py +++ b/services/sfs/src/stackit/sfs/models/update_share_export_policy_payload.py @@ -18,6 +18,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.sfs.models.update_share_export_policy_body_rule import ( @@ -41,7 +42,8 @@ class UpdateShareExportPolicyPayload(BaseModel): __properties: ClassVar[List[str]] = ["labels", "rules"] 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/sfs/src/stackit/sfs/models/update_share_export_policy_response.py b/services/sfs/src/stackit/sfs/models/update_share_export_policy_response.py index 985c3e745..1832e86b4 100644 --- a/services/sfs/src/stackit/sfs/models/update_share_export_policy_response.py +++ b/services/sfs/src/stackit/sfs/models/update_share_export_policy_response.py @@ -18,6 +18,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.sfs.models.share_export_policy import ShareExportPolicy @@ -32,7 +33,8 @@ class UpdateShareExportPolicyResponse(BaseModel): __properties: ClassVar[List[str]] = ["shareExportPolicy"] 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/sfs/src/stackit/sfs/models/update_share_payload.py b/services/sfs/src/stackit/sfs/models/update_share_payload.py index e4a42f90c..875e71edf 100644 --- a/services/sfs/src/stackit/sfs/models/update_share_payload.py +++ b/services/sfs/src/stackit/sfs/models/update_share_payload.py @@ -18,6 +18,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 @@ -43,7 +44,8 @@ class UpdateSharePayload(BaseModel): __properties: ClassVar[List[str]] = ["exportPolicyName", "labels", "spaceHardLimitGigabytes"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -54,8 +56,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/sfs/src/stackit/sfs/models/update_share_response.py b/services/sfs/src/stackit/sfs/models/update_share_response.py index f11f12a56..ed5e86b0e 100644 --- a/services/sfs/src/stackit/sfs/models/update_share_response.py +++ b/services/sfs/src/stackit/sfs/models/update_share_response.py @@ -18,6 +18,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.sfs.models.share import Share @@ -32,7 +33,8 @@ class UpdateShareResponse(BaseModel): __properties: ClassVar[List[str]] = ["share"] 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/sfs/src/stackit/sfs/models/validation_error.py b/services/sfs/src/stackit/sfs/models/validation_error.py index 00af91d02..6cf322a5b 100644 --- a/services/sfs/src/stackit/sfs/models/validation_error.py +++ b/services/sfs/src/stackit/sfs/models/validation_error.py @@ -18,6 +18,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.sfs.models.validation_error_field import ValidationErrorField @@ -39,7 +40,8 @@ class ValidationError(BaseModel): __properties: ClassVar[List[str]] = ["error_description", "title", "type", "fields"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -50,8 +52,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/sfs/src/stackit/sfs/models/validation_error_field.py b/services/sfs/src/stackit/sfs/models/validation_error_field.py index d4fde9a32..908b06ff9 100644 --- a/services/sfs/src/stackit/sfs/models/validation_error_field.py +++ b/services/sfs/src/stackit/sfs/models/validation_error_field.py @@ -18,6 +18,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 ValidationErrorField(BaseModel): __properties: ClassVar[List[str]] = ["field", "reason"] 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]: