From dc9a72141d6d58ca85335a311de750382113dd78 Mon Sep 17 00:00:00 2001 From: SDK Generator Bot Date: Tue, 12 May 2026 12:40:45 +0000 Subject: [PATCH] Generate serviceenablement --- services/serviceenablement/oas_commit | 2 +- .../stackit/serviceenablement/api_client.py | 32 +++++++++---------- .../serviceenablement/models/action_error.py | 7 ++-- .../serviceenablement/models/check_service.py | 10 ++++-- .../serviceenablement/models/cloud_service.py | 10 ++++-- .../serviceenablement/models/dependencies.py | 7 ++-- .../models/error_response.py | 7 ++-- ...ist_service_status_regional200_response.py | 7 ++-- .../serviceenablement/models/parameters.py | 7 ++-- .../models/parameters_general.py | 7 ++-- .../models/service_status.py | 10 ++++-- 11 files changed, 61 insertions(+), 45 deletions(-) diff --git a/services/serviceenablement/oas_commit b/services/serviceenablement/oas_commit index e3713dde3..f4a2ce25c 100644 --- a/services/serviceenablement/oas_commit +++ b/services/serviceenablement/oas_commit @@ -1 +1 @@ -0e64886dd0847341800d7191ed193b75413be998 +8f43ed707da765654e4427642c9d978f80d504e1 diff --git a/services/serviceenablement/src/stackit/serviceenablement/api_client.py b/services/serviceenablement/src/stackit/serviceenablement/api_client.py index 6df395eb3..a37013fd0 100644 --- a/services/serviceenablement/src/stackit/serviceenablement/api_client.py +++ b/services/serviceenablement/src/stackit/serviceenablement/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")): # noqa: B009 + 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/serviceenablement/src/stackit/serviceenablement/models/action_error.py b/services/serviceenablement/src/stackit/serviceenablement/models/action_error.py index 5e33bcf68..cb99d9abb 100644 --- a/services/serviceenablement/src/stackit/serviceenablement/models/action_error.py +++ b/services/serviceenablement/src/stackit/serviceenablement/models/action_error.py @@ -18,6 +18,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 @@ -42,7 +43,8 @@ def action_validate_enum(cls, value): return value 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/serviceenablement/src/stackit/serviceenablement/models/check_service.py b/services/serviceenablement/src/stackit/serviceenablement/models/check_service.py index bccdf41f7..640e29d0e 100644 --- a/services/serviceenablement/src/stackit/serviceenablement/models/check_service.py +++ b/services/serviceenablement/src/stackit/serviceenablement/models/check_service.py @@ -19,6 +19,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 Annotated, Self @@ -50,12 +51,16 @@ def service_id_validate_regular_expression(cls, value): if value is None: return value + if not isinstance(value, str): + value = str(value) + if not re.match(r"^[a-zA-Z0-9][a-zA-Z0-9._-]{1,254}$", value): raise ValueError(r"must validate the regular expression /^[a-zA-Z0-9][a-zA-Z0-9._-]{1,254}$/") return value model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -66,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/serviceenablement/src/stackit/serviceenablement/models/cloud_service.py b/services/serviceenablement/src/stackit/serviceenablement/models/cloud_service.py index 3ea90523f..666b4d095 100644 --- a/services/serviceenablement/src/stackit/serviceenablement/models/cloud_service.py +++ b/services/serviceenablement/src/stackit/serviceenablement/models/cloud_service.py @@ -19,6 +19,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 Annotated, Self from stackit.serviceenablement.models.dependencies import Dependencies @@ -53,12 +54,16 @@ def service_id_validate_regular_expression(cls, value): if value is None: return value + if not isinstance(value, str): + value = str(value) + if not re.match(r"^[a-zA-Z0-9][a-zA-Z0-9._-]{1,254}$", value): raise ValueError(r"must validate the regular expression /^[a-zA-Z0-9][a-zA-Z0-9._-]{1,254}$/") return value model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -69,8 +74,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/serviceenablement/src/stackit/serviceenablement/models/dependencies.py b/services/serviceenablement/src/stackit/serviceenablement/models/dependencies.py index 460ddae1d..8b9cf3c7e 100644 --- a/services/serviceenablement/src/stackit/serviceenablement/models/dependencies.py +++ b/services/serviceenablement/src/stackit/serviceenablement/models/dependencies.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 Annotated, Self @@ -37,7 +38,8 @@ class Dependencies(BaseModel): __properties: ClassVar[List[str]] = ["hard", "soft"] 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/serviceenablement/src/stackit/serviceenablement/models/error_response.py b/services/serviceenablement/src/stackit/serviceenablement/models/error_response.py index d907adc82..f3bb3fb9d 100644 --- a/services/serviceenablement/src/stackit/serviceenablement/models/error_response.py +++ b/services/serviceenablement/src/stackit/serviceenablement/models/error_response.py @@ -20,6 +20,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr, field_validator +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -49,7 +50,8 @@ def timestamp_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=(), ) @@ -60,8 +62,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/serviceenablement/src/stackit/serviceenablement/models/list_service_status_regional200_response.py b/services/serviceenablement/src/stackit/serviceenablement/models/list_service_status_regional200_response.py index 25cb50727..20a483287 100644 --- a/services/serviceenablement/src/stackit/serviceenablement/models/list_service_status_regional200_response.py +++ b/services/serviceenablement/src/stackit/serviceenablement/models/list_service_status_regional200_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 from stackit.serviceenablement.models.service_status import ServiceStatus @@ -33,7 +34,8 @@ class ListServiceStatusRegional200Response(BaseModel): __properties: ClassVar[List[str]] = ["items", "nextCursor"] 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/serviceenablement/src/stackit/serviceenablement/models/parameters.py b/services/serviceenablement/src/stackit/serviceenablement/models/parameters.py index 228cd00da..ca622f085 100644 --- a/services/serviceenablement/src/stackit/serviceenablement/models/parameters.py +++ b/services/serviceenablement/src/stackit/serviceenablement/models/parameters.py @@ -18,6 +18,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.serviceenablement.models.parameters_general import ParametersGeneral @@ -33,7 +34,8 @@ class Parameters(BaseModel): __properties: ClassVar[List[str]] = ["general"] 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/serviceenablement/src/stackit/serviceenablement/models/parameters_general.py b/services/serviceenablement/src/stackit/serviceenablement/models/parameters_general.py index 918526308..80ade9105 100644 --- a/services/serviceenablement/src/stackit/serviceenablement/models/parameters_general.py +++ b/services/serviceenablement/src/stackit/serviceenablement/models/parameters_general.py @@ -18,6 +18,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 @@ -42,7 +43,8 @@ def project_scope_validate_enum(cls, value): return value 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/serviceenablement/src/stackit/serviceenablement/models/service_status.py b/services/serviceenablement/src/stackit/serviceenablement/models/service_status.py index 1819e16e7..4c16c919d 100644 --- a/services/serviceenablement/src/stackit/serviceenablement/models/service_status.py +++ b/services/serviceenablement/src/stackit/serviceenablement/models/service_status.py @@ -19,6 +19,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 Annotated, Self from stackit.serviceenablement.models.action_error import ActionError @@ -90,6 +91,9 @@ def service_id_validate_regular_expression(cls, value): if value is None: return value + if not isinstance(value, str): + value = str(value) + if not re.match(r"^[a-zA-Z0-9][a-zA-Z0-9._-]{1,254}$", value): raise ValueError(r"must validate the regular expression /^[a-zA-Z0-9][a-zA-Z0-9._-]{1,254}$/") return value @@ -105,7 +109,8 @@ def state_validate_enum(cls, value): return value model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -116,8 +121,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]: