stackit-kms 0.8.1__tar.gz → 0.10.0__tar.gz

{stackit_kms-0.8.1 → stackit_kms-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stackit-kms
-Version: 0.8.1
+Version: 0.10.0
 Summary: STACKIT Key Management Service API
 Project-URL: Homepage, https://github.com/stackitcloud/stackit-sdk-python
 Project-URL: Issues, https://github.com/stackitcloud/stackit-sdk-python/issues

{stackit_kms-0.8.1 → stackit_kms-0.10.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "stackit-kms"
-version = "v0.8.1"
+version = "v0.10.0"
 description = "STACKIT Key Management Service API"
 authors = [{ name = "STACKIT Developer Tools", email = "developer-tools@stackit.cloud" }]
 requires-python = ">=3.9,<4.0"

{stackit_kms-0.8.1 → stackit_kms-0.10.0}/src/stackit/kms/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 @@ class ApiClient:
         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 @@ class ApiClient:
             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 @@ class ApiClient:
             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:

{stackit_kms-0.8.1 → stackit_kms-0.10.0}/src/stackit/kms/models/create_key_payload.py

@@ -26,6 +26,7 @@ from pydantic import (
     StrictStr,
     field_validator,
 )
+from pydantic_core import to_jsonable_python
 from typing_extensions import Annotated, Self
 
 from stackit.kms.models.access_scope import AccessScope
@@ -66,12 +67,16 @@ class CreateKeyPayload(BaseModel):
     @field_validator("display_name")
     def display_name_validate_regular_expression(cls, value):
         """Validates the regular expression"""
+        if not isinstance(value, str):
+            value = str(value)
+
         if not re.match(r"^[a-zA-Z0-9_-]+$", value):
             raise ValueError(r"must validate the regular expression /^[a-zA-Z0-9_-]+$/")
         return value
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -82,8 +87,7 @@ class CreateKeyPayload(BaseModel):
 
     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]:

{stackit_kms-0.8.1 → stackit_kms-0.10.0}/src/stackit/kms/models/create_key_ring_payload.py

@@ -19,6 +19,7 @@ import re  # noqa: F401
 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
 
 
@@ -39,12 +40,16 @@ class CreateKeyRingPayload(BaseModel):
     @field_validator("display_name")
     def display_name_validate_regular_expression(cls, value):
         """Validates the regular expression"""
+        if not isinstance(value, str):
+            value = str(value)
+
         if not re.match(r"^[a-zA-Z0-9_-]+$", value):
             raise ValueError(r"must validate the regular expression /^[a-zA-Z0-9_-]+$/")
         return value
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -55,8 +60,7 @@ class CreateKeyRingPayload(BaseModel):
 
     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]:

{stackit_kms-0.8.1 → stackit_kms-0.10.0}/src/stackit/kms/models/create_wrapping_key_payload.py

@@ -19,6 +19,7 @@ import re  # noqa: F401
 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.kms.models.access_scope import AccessScope
@@ -55,12 +56,16 @@ class CreateWrappingKeyPayload(BaseModel):
     @field_validator("display_name")
     def display_name_validate_regular_expression(cls, value):
         """Validates the regular expression"""
+        if not isinstance(value, str):
+            value = str(value)
+
         if not re.match(r"^[a-zA-Z0-9_-]+$", value):
             raise ValueError(r"must validate the regular expression /^[a-zA-Z0-9_-]+$/")
         return value
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -71,8 +76,7 @@ class CreateWrappingKeyPayload(BaseModel):
 
     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]:

{stackit_kms-0.8.1 → stackit_kms-0.10.0}/src/stackit/kms/models/decrypt_payload.py

@@ -24,6 +24,7 @@ from pydantic import (
     StrictBytes,
     StrictStr,
 )
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 
@@ -36,7 +37,8 @@ class DecryptPayload(BaseModel):
     __properties: ClassVar[List[str]] = ["data"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -47,8 +49,7 @@ class DecryptPayload(BaseModel):
 
     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]:

{stackit_kms-0.8.1 → stackit_kms-0.10.0}/src/stackit/kms/models/decrypted_data.py

@@ -24,6 +24,7 @@ from pydantic import (
     StrictBytes,
     StrictStr,
 )
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 
@@ -36,7 +37,8 @@ class DecryptedData(BaseModel):
     __properties: ClassVar[List[str]] = ["data"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -47,8 +49,7 @@ class DecryptedData(BaseModel):
 
     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]:

{stackit_kms-0.8.1 → stackit_kms-0.10.0}/src/stackit/kms/models/encrypt_payload.py

@@ -24,6 +24,7 @@ from pydantic import (
     StrictBytes,
     StrictStr,
 )
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 
@@ -36,7 +37,8 @@ class EncryptPayload(BaseModel):
     __properties: ClassVar[List[str]] = ["data"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -47,8 +49,7 @@ class EncryptPayload(BaseModel):
 
     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]:

{stackit_kms-0.8.1 → stackit_kms-0.10.0}/src/stackit/kms/models/encrypted_data.py

@@ -24,6 +24,7 @@ from pydantic import (
     StrictBytes,
     StrictStr,
 )
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 
@@ -36,7 +37,8 @@ class EncryptedData(BaseModel):
     __properties: ClassVar[List[str]] = ["data"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -47,8 +49,7 @@ class EncryptedData(BaseModel):
 
     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]:

{stackit_kms-0.8.1 → stackit_kms-0.10.0}/src/stackit/kms/models/http_error.py

@@ -18,6 +18,7 @@ import pprint
 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 HttpError(BaseModel):
     __properties: ClassVar[List[str]] = ["message"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -41,8 +43,7 @@ class HttpError(BaseModel):
 
     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]:

{stackit_kms-0.8.1 → stackit_kms-0.10.0}/src/stackit/kms/models/import_key_payload.py

@@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set
 from uuid import UUID
 
 from pydantic import BaseModel, ConfigDict, Field, StrictStr
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 
@@ -36,7 +37,8 @@ class ImportKeyPayload(BaseModel):
     __properties: ClassVar[List[str]] = ["wrappedKey", "wrappingKeyId"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -47,8 +49,7 @@ class ImportKeyPayload(BaseModel):
 
     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]:

{stackit_kms-0.8.1 → stackit_kms-0.10.0}/src/stackit/kms/models/key.py

@@ -28,6 +28,7 @@ from pydantic import (
     StrictStr,
     field_validator,
 )
+from pydantic_core import to_jsonable_python
 from typing_extensions import Annotated, Self
 
 from stackit.kms.models.access_scope import AccessScope
@@ -116,7 +117,8 @@ class Key(BaseModel):
         return value
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -127,8 +129,7 @@ class Key(BaseModel):
 
     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]:

{stackit_kms-0.8.1 → stackit_kms-0.10.0}/src/stackit/kms/models/key_list.py

@@ -18,6 +18,7 @@ import pprint
 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.kms.models.key import Key
@@ -32,7 +33,8 @@ class KeyList(BaseModel):
     __properties: ClassVar[List[str]] = ["keys"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -43,8 +45,7 @@ class KeyList(BaseModel):
 
     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]:

{stackit_kms-0.8.1 → stackit_kms-0.10.0}/src/stackit/kms/models/key_ring.py

@@ -21,6 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set
 from uuid import UUID
 
 from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
+from pydantic_core import to_jsonable_python
 from typing_extensions import Annotated, Self
 
 
@@ -63,7 +64,8 @@ class KeyRing(BaseModel):
         return value
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -74,8 +76,7 @@ class KeyRing(BaseModel):
 
     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]:

{stackit_kms-0.8.1 → stackit_kms-0.10.0}/src/stackit/kms/models/key_ring_list.py

@@ -18,6 +18,7 @@ import pprint
 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.kms.models.key_ring import KeyRing
@@ -32,7 +33,8 @@ class KeyRingList(BaseModel):
     __properties: ClassVar[List[str]] = ["keyRings"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -43,8 +45,7 @@ class KeyRingList(BaseModel):
 
     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]:

{stackit_kms-0.8.1 → stackit_kms-0.10.0}/src/stackit/kms/models/sign_payload.py

@@ -24,6 +24,7 @@ from pydantic import (
     StrictBytes,
     StrictStr,
 )
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 
@@ -36,7 +37,8 @@ class SignPayload(BaseModel):
     __properties: ClassVar[List[str]] = ["data"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -47,8 +49,7 @@ class SignPayload(BaseModel):
 
     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]:

{stackit_kms-0.8.1 → stackit_kms-0.10.0}/src/stackit/kms/models/signed_data.py

@@ -24,6 +24,7 @@ from pydantic import (
     StrictBytes,
     StrictStr,
 )
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 
@@ -37,7 +38,8 @@ class SignedData(BaseModel):
     __properties: ClassVar[List[str]] = ["data", "signature"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -48,8 +50,7 @@ class SignedData(BaseModel):
 
     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]:

{stackit_kms-0.8.1 → stackit_kms-0.10.0}/src/stackit/kms/models/verified_data.py

@@ -18,6 +18,7 @@ import pprint
 from typing import Any, ClassVar, Dict, List, Optional, Set
 
 from pydantic import BaseModel, ConfigDict, Field, StrictBool
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 
@@ -30,7 +31,8 @@ class VerifiedData(BaseModel):
     __properties: ClassVar[List[str]] = ["valid"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -41,8 +43,7 @@ class VerifiedData(BaseModel):
 
     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]:

{stackit_kms-0.8.1 → stackit_kms-0.10.0}/src/stackit/kms/models/verify_payload.py

@@ -24,6 +24,7 @@ from pydantic import (
     StrictBytes,
     StrictStr,
 )
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 
@@ -37,7 +38,8 @@ class VerifyPayload(BaseModel):
     __properties: ClassVar[List[str]] = ["data", "signature"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -48,8 +50,7 @@ class VerifyPayload(BaseModel):
 
     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]:

{stackit_kms-0.8.1 → stackit_kms-0.10.0}/src/stackit/kms/models/version.py

@@ -29,6 +29,7 @@ from pydantic import (
     StrictStr,
     field_validator,
 )
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 
@@ -106,7 +107,8 @@ class Version(BaseModel):
         return value
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -117,8 +119,7 @@ class Version(BaseModel):
 
     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]:

{stackit_kms-0.8.1 → stackit_kms-0.10.0}/src/stackit/kms/models/version_list.py

@@ -18,6 +18,7 @@ import pprint
 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.kms.models.version import Version
@@ -32,7 +33,8 @@ class VersionList(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=(),
     )
@@ -43,8 +45,7 @@ class VersionList(BaseModel):
 
     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]:

{stackit_kms-0.8.1 → stackit_kms-0.10.0}/src/stackit/kms/models/wrapping_key.py

@@ -21,6 +21,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set
 from uuid import UUID
 
 from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
+from pydantic_core import to_jsonable_python
 from typing_extensions import Annotated, Self
 
 from stackit.kms.models.access_scope import AccessScope
@@ -51,7 +52,9 @@ class WrappingKey(BaseModel):
         description="The unique id of the key ring this wrapping key is assigned to.", alias="keyRingId"
     )
     protection: Protection
-    public_key: StrictStr = Field(description="The public key of the wrapping key.", alias="publicKey")
+    public_key: Optional[StrictStr] = Field(
+        default=None, description="The public key of the wrapping key.", alias="publicKey"
+    )
     purpose: WrappingPurpose
     state: StrictStr = Field(description="The current state of the wrapping key.")
     __properties: ClassVar[List[str]] = [
@@ -105,7 +108,8 @@ class WrappingKey(BaseModel):
         return value
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -116,8 +120,7 @@ class WrappingKey(BaseModel):
 
     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]:

{stackit_kms-0.8.1 → stackit_kms-0.10.0}/src/stackit/kms/models/wrapping_key_list.py

@@ -18,6 +18,7 @@ import pprint
 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.kms.models.wrapping_key import WrappingKey
@@ -32,7 +33,8 @@ class WrappingKeyList(BaseModel):
     __properties: ClassVar[List[str]] = ["wrappingKeys"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -43,8 +45,7 @@ class WrappingKeyList(BaseModel):
 
     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]: