stackit-serverbackup 1.1.1__py3-none-any.whl → 1.2.0__py3-none-any.whl

stackit/serverbackup/api_client.py

@@ -13,11 +13,13 @@
 """  # noqa: E501
 
 import datetime
+import decimal
 import json
 import mimetypes
 import os
 import re
 import tempfile
+import uuid
 from enum import Enum
 from typing import Dict, List, Optional, Tuple, Union
 from urllib.parse import quote
@@ -64,8 +66,11 @@ class ApiClient:
         "bool": bool,
         "date": datetime.date,
         "datetime": datetime.datetime,
+        "decimal": decimal.Decimal,
+        "UUID": uuid.UUID,
         "object": object,
     }
+    _pool = None
 
     def __init__(self, configuration, header_name=None, header_value=None, cookie=None) -> None:
         self.config: Configuration = configuration
@@ -262,13 +267,13 @@ 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)
             elif response_type is not None:
                 match = None
-                content_type = response_data.getheader("content-type")
+                content_type = response_data.headers.get("content-type")
                 if content_type is not None:
                     match = re.search(r"charset=([a-zA-Z\-\d]+)[\s;]?", content_type)
                 encoding = match.group(1) if match else "utf-8"
@@ -285,7 +290,7 @@ class ApiClient:
         return ApiResponse(
             status_code=response_data.status,
             data=return_data,
-            headers=response_data.getheaders(),
+            headers=response_data.headers,
             raw_data=response_data.data,
         )
 
@@ -297,6 +302,7 @@ class ApiClient:
         If obj is str, int, long, float, bool, return directly.
         If obj is datetime.datetime, datetime.date
             convert to string in iso8601 format.
+        If obj is decimal.Decimal return string representation.
         If obj is list, sanitize each element in the list.
         If obj is dict, return the dict.
         If obj is OpenAPI model, return the properties dict.
@@ -312,31 +318,30 @@ class ApiClient:
             return obj.get_secret_value()
         elif isinstance(obj, self.PRIMITIVE_TYPES):
             return obj
+        elif isinstance(obj, uuid.UUID):
+            return str(obj)
         elif isinstance(obj, list):
             return [self.sanitize_for_serialization(sub_obj) for sub_obj in obj]
         elif isinstance(obj, tuple):
             return tuple(self.sanitize_for_serialization(sub_obj) for sub_obj in obj)
         elif isinstance(obj, (datetime.datetime, datetime.date)):
             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(obj.to_dict):
-                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.
@@ -355,7 +360,7 @@ class ApiClient:
                 data = json.loads(response_text)
             except ValueError:
                 data = response_text
-        elif re.match(r"^application/(json|[\w!#$&.+-^_]+\+json)\s*(;|$)", content_type, re.IGNORECASE):
+        elif re.match(r"^application/(json|[\w!#$&.+\-^_]+\+json)\s*(;|$)", content_type, re.IGNORECASE):
             if response_text == "":
                 data = ""
             else:
@@ -401,12 +406,16 @@ class ApiClient:
 
         if klass in self.PRIMITIVE_TYPES:
             return self.__deserialize_primitive(data, klass)
-        elif klass == object:
+        elif klass is object:
             return self.__deserialize_object(data)
-        elif klass == datetime.date:
+        elif klass is datetime.date:
             return self.__deserialize_date(data)
-        elif klass == datetime.datetime:
+        elif klass is datetime.datetime:
             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:
@@ -554,12 +563,14 @@ class ApiClient:
         os.close(fd)
         os.remove(path)
 
-        content_disposition = response.getheader("Content-Disposition")
+        content_disposition = response.headers.get("Content-Disposition")
         if content_disposition:
             m = re.search(r'filename=[\'"]?([^\'"\s]+)[\'"]?', content_disposition)
             if m is None:
                 raise ValueError("Unexpected 'content-disposition' header value")
-            filename = m.group(1)
+            filename = os.path.basename(m.group(1))  # Strip any directory traversal
+            if filename in ("", ".", ".."):  # fall back to tmp filename
+                filename = os.path.basename(path)
             path = os.path.join(os.path.dirname(path), filename)
 
         with open(path, "wb") as f:

stackit/serverbackup/exceptions.py

@@ -130,7 +130,7 @@ class ApiException(OpenApiException):
                     self.body = http_resp.data.decode("utf-8")
                 except Exception:  # noqa: S110
                     pass
-            self.headers = http_resp.getheaders()
+            self.headers = http_resp.headers
 
     @classmethod
     def from_response(

stackit/serverbackup/models/__init__.py

@@ -13,7 +13,6 @@
     Do not edit the class manually.
 """  # noqa: E501
 
-
 # import models into model package
 from stackit.serverbackup.models.backup import Backup
 from stackit.serverbackup.models.backup_job import BackupJob

stackit/serverbackup/models/backup.py

@@ -19,6 +19,7 @@ import pprint
 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.serverbackup.models.backup_volume_backups_inner import (
@@ -71,7 +72,8 @@ class Backup(BaseModel):
         return value
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -82,8 +84,7 @@ class Backup(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]:
@@ -110,9 +111,9 @@ class Backup(BaseModel):
         # override the default output from pydantic by calling `to_dict()` of each item in volume_backups (list)
         _items = []
         if self.volume_backups:
-            for _item in self.volume_backups:
-                if _item:
-                    _items.append(_item.to_dict())
+            for _item_volume_backups in self.volume_backups:
+                if _item_volume_backups:
+                    _items.append(_item_volume_backups.to_dict())
             _dict["volumeBackups"] = _items
         return _dict
 

stackit/serverbackup/models/backup_job.py

@@ -19,6 +19,7 @@ import pprint
 from typing import Any, ClassVar, Dict, List, Optional, Set
 
 from pydantic import BaseModel, ConfigDict, StrictStr
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 
@@ -31,7 +32,8 @@ class BackupJob(BaseModel):
     __properties: ClassVar[List[str]] = ["id"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -42,8 +44,7 @@ class BackupJob(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/serverbackup/models/backup_policy.py

@@ -25,6 +25,7 @@ from pydantic import (
     StrictBool,
     StrictStr,
 )
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 from stackit.serverbackup.models.backup_policy_backup_properties import (
@@ -43,11 +44,15 @@ class BackupPolicy(BaseModel):
     enabled: Optional[StrictBool] = None
     id: Optional[StrictStr] = None
     name: Optional[StrictStr] = None
-    rrule: Optional[StrictStr] = None
+    rrule: Optional[StrictStr] = Field(
+        default=None,
+        description="An rrule (Recurrence Rule) is a standardized string format used in iCalendar (RFC 5545) to define repeating events, and you can generate one by using a dedicated library or by using online generator tools to specify parameters like frequency, interval, and end dates",
+    )
     __properties: ClassVar[List[str]] = ["backupProperties", "default", "description", "enabled", "id", "name", "rrule"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -58,8 +63,7 @@ class BackupPolicy(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/serverbackup/models/backup_policy_backup_properties.py

@@ -19,6 +19,7 @@ import pprint
 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 BackupPolicyBackupProperties(BaseModel):
     __properties: ClassVar[List[str]] = ["name", "retentionPeriod"]
 
     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 BackupPolicyBackupProperties(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/serverbackup/models/backup_properties.py

@@ -19,6 +19,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 Annotated, Self
 
 
@@ -35,7 +36,8 @@ class BackupProperties(BaseModel):
     __properties: ClassVar[List[str]] = ["name", "retentionPeriod", "volumeIds"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -46,8 +48,7 @@ class BackupProperties(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/serverbackup/models/backup_schedule.py

@@ -26,6 +26,7 @@ from pydantic import (
     StrictInt,
     StrictStr,
 )
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 from stackit.serverbackup.models.backup_properties import BackupProperties
@@ -40,11 +41,14 @@ class BackupSchedule(BaseModel):
     enabled: StrictBool
     id: StrictInt
     name: StrictStr
-    rrule: StrictStr
+    rrule: StrictStr = Field(
+        description="An rrule (Recurrence Rule) is a standardized string format used in iCalendar (RFC 5545) to define repeating events, and you can generate one by using a dedicated library or by using online generator tools to specify parameters like frequency, interval, and end dates"
+    )
     __properties: ClassVar[List[str]] = ["backupProperties", "enabled", "id", "name", "rrule"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -55,8 +59,7 @@ class BackupSchedule(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/serverbackup/models/backup_volume_backups_inner.py

@@ -19,6 +19,7 @@ import pprint
 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
 
 
@@ -60,7 +61,8 @@ class BackupVolumeBackupsInner(BaseModel):
         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 @@ class BackupVolumeBackupsInner(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/serverbackup/models/create_backup_payload.py

@@ -19,6 +19,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 Annotated, Self
 
 
@@ -35,7 +36,8 @@ class CreateBackupPayload(BaseModel):
     __properties: ClassVar[List[str]] = ["name", "retentionPeriod", "volumeIds"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -46,8 +48,7 @@ class CreateBackupPayload(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/serverbackup/models/create_backup_schedule_payload.py

@@ -25,6 +25,7 @@ from pydantic import (
     StrictBool,
     StrictStr,
 )
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 from stackit.serverbackup.models.backup_properties import BackupProperties
@@ -38,11 +39,14 @@ class CreateBackupSchedulePayload(BaseModel):
     backup_properties: Optional[BackupProperties] = Field(default=None, alias="backupProperties")
     enabled: StrictBool
     name: StrictStr = Field(description="Max 255 characters")
-    rrule: StrictStr
+    rrule: StrictStr = Field(
+        description="An rrule (Recurrence Rule) is a standardized string format used in iCalendar (RFC 5545) to define repeating events, and you can generate one by using a dedicated library or by using online generator tools to specify parameters like frequency, interval, and end dates"
+    )
     __properties: ClassVar[List[str]] = ["backupProperties", "enabled", "name", "rrule"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -53,8 +57,7 @@ class CreateBackupSchedulePayload(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/serverbackup/models/enable_service_resource_payload.py

@@ -17,8 +17,10 @@ from __future__ import annotations
 import json
 import pprint
 from typing import Any, ClassVar, Dict, List, Optional, Set
+from uuid import UUID
 
-from pydantic import BaseModel, ConfigDict, Field, StrictStr
+from pydantic import BaseModel, ConfigDict, Field
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 
@@ -27,11 +29,12 @@ class EnableServiceResourcePayload(BaseModel):
     EnableServiceResourcePayload
     """  # noqa: E501
 
-    backup_policy_id: Optional[StrictStr] = Field(default=None, alias="backupPolicyId")
+    backup_policy_id: Optional[UUID] = Field(default=None, alias="backupPolicyId")
     __properties: ClassVar[List[str]] = ["backupPolicyId"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -42,8 +45,7 @@ class EnableServiceResourcePayload(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/serverbackup/models/error_response.py

@@ -19,6 +19,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
 
 
@@ -34,7 +35,8 @@ class ErrorResponse(BaseModel):
     __properties: ClassVar[List[str]] = ["message", "status"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -45,8 +47,7 @@ class ErrorResponse(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/serverbackup/models/get_backup_policies_response.py

@@ -19,6 +19,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.serverbackup.models.backup_policy import BackupPolicy
@@ -33,7 +34,8 @@ class GetBackupPoliciesResponse(BaseModel):
     __properties: ClassVar[List[str]] = ["items"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -44,8 +46,7 @@ class GetBackupPoliciesResponse(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]:
@@ -72,9 +73,9 @@ class GetBackupPoliciesResponse(BaseModel):
         # override the default output from pydantic by calling `to_dict()` of each item in items (list)
         _items = []
         if self.items:
-            for _item in self.items:
-                if _item:
-                    _items.append(_item.to_dict())
+            for _item_items in self.items:
+                if _item_items:
+                    _items.append(_item_items.to_dict())
             _dict["items"] = _items
         return _dict
 

stackit/serverbackup/models/get_backup_schedules_response.py

@@ -19,6 +19,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.serverbackup.models.backup_schedule import BackupSchedule
@@ -33,7 +34,8 @@ class GetBackupSchedulesResponse(BaseModel):
     __properties: ClassVar[List[str]] = ["items"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -44,8 +46,7 @@ class GetBackupSchedulesResponse(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]:
@@ -72,9 +73,9 @@ class GetBackupSchedulesResponse(BaseModel):
         # override the default output from pydantic by calling `to_dict()` of each item in items (list)
         _items = []
         if self.items:
-            for _item in self.items:
-                if _item:
-                    _items.append(_item.to_dict())
+            for _item_items in self.items:
+                if _item_items:
+                    _items.append(_item_items.to_dict())
             _dict["items"] = _items
         return _dict
 

stackit/serverbackup/models/get_backup_service_response.py

@@ -19,6 +19,7 @@ import pprint
 from typing import Any, ClassVar, Dict, List, Optional, Set
 
 from pydantic import BaseModel, ConfigDict, StrictBool
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 
@@ -31,7 +32,8 @@ class GetBackupServiceResponse(BaseModel):
     __properties: ClassVar[List[str]] = ["enabled"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -42,8 +44,7 @@ class GetBackupServiceResponse(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/serverbackup/models/get_backups_list_response.py

@@ -19,6 +19,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.serverbackup.models.backup import Backup
@@ -33,7 +34,8 @@ class GetBackupsListResponse(BaseModel):
     __properties: ClassVar[List[str]] = ["items"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -44,8 +46,7 @@ class GetBackupsListResponse(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]:
@@ -72,9 +73,9 @@ class GetBackupsListResponse(BaseModel):
         # override the default output from pydantic by calling `to_dict()` of each item in items (list)
         _items = []
         if self.items:
-            for _item in self.items:
-                if _item:
-                    _items.append(_item.to_dict())
+            for _item_items in self.items:
+                if _item_items:
+                    _items.append(_item_items.to_dict())
             _dict["items"] = _items
         return _dict
 

stackit/serverbackup/models/restore_backup_payload.py

@@ -25,6 +25,7 @@ from pydantic import (
     StrictBool,
     StrictStr,
 )
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 
@@ -38,7 +39,8 @@ class RestoreBackupPayload(BaseModel):
     __properties: ClassVar[List[str]] = ["startServerAfterRestore", "volumeIds"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -49,8 +51,7 @@ class RestoreBackupPayload(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/serverbackup/models/restore_volume_backup_payload.py

@@ -19,6 +19,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
 
 
@@ -31,7 +32,8 @@ class RestoreVolumeBackupPayload(BaseModel):
     __properties: ClassVar[List[str]] = ["restoreVolumeId"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -42,8 +44,7 @@ class RestoreVolumeBackupPayload(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/serverbackup/models/update_backup_schedule_payload.py

@@ -25,6 +25,7 @@ from pydantic import (
     StrictBool,
     StrictStr,
 )
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 from stackit.serverbackup.models.backup_properties import BackupProperties
@@ -38,11 +39,14 @@ class UpdateBackupSchedulePayload(BaseModel):
     backup_properties: Optional[BackupProperties] = Field(default=None, alias="backupProperties")
     enabled: StrictBool
     name: StrictStr = Field(description="Max 255 characters")
-    rrule: StrictStr
+    rrule: StrictStr = Field(
+        description="An rrule (Recurrence Rule) is a standardized string format used in iCalendar (RFC 5545) to define repeating events, and you can generate one by using a dedicated library or by using online generator tools to specify parameters like frequency, interval, and end dates"
+    )
     __properties: ClassVar[List[str]] = ["backupProperties", "enabled", "name", "rrule"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -53,8 +57,7 @@ class UpdateBackupSchedulePayload(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/serverbackup/rest.py

@@ -39,12 +39,17 @@ class RESTResponse(io.IOBase):
             self.data = self.response.content
         return self.data
 
+    @property
+    def headers(self):
+        """Returns a dictionary of response headers."""
+        return self.response.headers
+
     def getheaders(self):
-        """Returns a dictionary of the response headers."""
+        """Returns a dictionary of the response headers; use ``headers`` instead."""
         return self.response.headers
 
     def getheader(self, name, default=None):
-        """Returns a given response header."""
+        """Returns a given response header; use ``headers.get()`` instead."""
         return self.response.headers.get(name, default)
 
 
@@ -94,6 +99,7 @@ class RESTClientObject:
                         url,
                         data=request_body,
                         headers=headers,
+                        timeout=_request_timeout,
                     )
                 elif content_type == "application/x-www-form-urlencoded":
                     r = self.session.request(
@@ -101,6 +107,7 @@ class RESTClientObject:
                         url,
                         params=post_params,
                         headers=headers,
+                        timeout=_request_timeout,
                     )
                 elif content_type == "multipart/form-data":
                     # must del headers['Content-Type'], or the correct
@@ -114,6 +121,7 @@ class RESTClientObject:
                         url,
                         files=post_params,
                         headers=headers,
+                        timeout=_request_timeout,
                     )
                 # Pass a `string` parameter directly in the body to support
                 # other content types than JSON when `body` argument is
@@ -124,10 +132,17 @@ class RESTClientObject:
                         url,
                         data=body,
                         headers=headers,
+                        timeout=_request_timeout,
                     )
                 elif headers["Content-Type"].startswith("text/") and isinstance(body, bool):
                     request_body = "true" if body else "false"
-                    r = self.session.request(method, url, data=request_body, headers=headers)
+                    r = self.session.request(
+                        method,
+                        url,
+                        data=request_body,
+                        headers=headers,
+                        timeout=_request_timeout,
+                    )
                 else:
                     # Cannot generate the request from given parameters
                     msg = """Cannot prepare a request message for provided
@@ -141,6 +156,7 @@ class RESTClientObject:
                     url,
                     params={},
                     headers=headers,
+                    timeout=_request_timeout,
                 )
         except requests.exceptions.SSLError as e:
             msg = "\n".join([type(e).__name__, str(e)])

{stackit_serverbackup-1.1.1.dist-info → stackit_serverbackup-1.2.0.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: stackit-serverbackup
-Version: 1.1.1
+Version: 1.2.0
 Summary: STACKIT Server Backup Management API
+Project-URL: Homepage, https://github.com/stackitcloud/stackit-sdk-python
+Project-URL: Issues, https://github.com/stackitcloud/stackit-sdk-python/issues
+Author-email: STACKIT Developer Tools <developer-tools@stackit.cloud>
 License-File: LICENSE.md
 License-File: NOTICE.txt
-Author: STACKIT Developer Tools
-Author-email: developer-tools@stackit.cloud
-Requires-Python: >=3.9,<4.0
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
@@ -16,12 +16,11 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
-Requires-Dist: pydantic (>=2.9.2)
-Requires-Dist: python-dateutil (>=2.9.0.post0)
-Requires-Dist: requests (>=2.32.3)
-Requires-Dist: stackit-core (>=0.0.1a)
-Project-URL: Homepage, https://github.com/stackitcloud/stackit-sdk-python
-Project-URL: Issues, https://github.com/stackitcloud/stackit-sdk-python/issues
+Requires-Python: <4.0,>=3.9
+Requires-Dist: pydantic>=2.9.2
+Requires-Dist: python-dateutil>=2.9.0.post0
+Requires-Dist: requests>=2.32.3
+Requires-Dist: stackit-core>=0.0.1a
 Description-Content-Type: text/markdown
 
 # stackit.serverbackup
@@ -45,4 +44,4 @@ import stackit.serverbackup
 
 ## Getting Started
 
-[Examples](https://github.com/stackitcloud/stackit-sdk-python/tree/main/examples) for the usage of the package can be found in the [GitHub repository](https://github.com/stackitcloud/stackit-sdk-python) of the SDK.
+[Examples](https://github.com/stackitcloud/stackit-sdk-python/tree/main/examples) for the usage of the package can be found in the [GitHub repository](https://github.com/stackitcloud/stackit-sdk-python) of the SDK.

stackit_serverbackup-1.2.0.dist-info/RECORD

@@ -0,0 +1,33 @@
+stackit/serverbackup/__init__.py,sha256=VG35es8cPZHtrEahl3jZkbYoO-Ij4yIeK85bleiiGpc,4053
+stackit/serverbackup/api_client.py,sha256=SOON9YYDXDtShjs8qVb9yrjTrSdlgtKDJl34gUCH-Gg,23782
+stackit/serverbackup/api_response.py,sha256=HRYkVqMNIlfODacTQPTbiVj2YdcnutpQrKJdeAoCSpM,642
+stackit/serverbackup/configuration.py,sha256=TGWzzKqb_W5ULS314KdI1klLZTeNi644caUcANc15-w,5719
+stackit/serverbackup/exceptions.py,sha256=PGB2_qXHzry8GTiOuzykhNp5xCiCxHus-alHZTvZP3Q,6432
+stackit/serverbackup/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+stackit/serverbackup/rest.py,sha256=eBxYfyGIsPby0sh7k5A8sQLSCLsrM7SH4Qr3VrxRODY,6427
+stackit/serverbackup/api/__init__.py,sha256=4gnwP89FX1nQYLr9Mg7TDzyxbWvl2JNyavFrb9moimM,107
+stackit/serverbackup/api/default_api.py,sha256=yeoTAHG_yBvaQYhSQ80duIEMd6WzMelD36N-5XELdm4,194803
+stackit/serverbackup/models/__init__.py,sha256=hJCXX9NE1xy5dQt1ErlJatZBAWtBaQvTr-nEUHYS99E,1990
+stackit/serverbackup/models/backup.py,sha256=XG2qm6FWj3iGN75o3t9oVMM38zKtcDBwAcex5yEXsLA,4672
+stackit/serverbackup/models/backup_job.py,sha256=FPU2j0pHxqbHbRJlONZLdb2JzwPSbzOlyA1MZXE2Nkc,2390
+stackit/serverbackup/models/backup_policy.py,sha256=DDahugfK-po9vLQBfrnfxYNNlZtcXh8TeXdj3IOd1_I,4003
+stackit/serverbackup/models/backup_policy_backup_properties.py,sha256=KyawhZlrovO7RXYuVO-dZgfvtHGG_hcG8O3ng9pQJi0,2664
+stackit/serverbackup/models/backup_properties.py,sha256=wAi2E0l-0-WDgfPwwxry-51mY7h7fTXCFAsEepbnk74,2873
+stackit/serverbackup/models/backup_schedule.py,sha256=Q7j4k4xQduWwffnJ4RjMYadq49Obk8l8WdKetXEt5y4,3670
+stackit/serverbackup/models/backup_volume_backups_inner.py,sha256=ZKOLJIH0iv7e8AVmETxCYbLBl-uKI3y1fnnXSEqyldw,3978
+stackit/serverbackup/models/create_backup_payload.py,sha256=ysWsWctgkUcFefji1V72PVFQJ2i9EySAI_YS2VnQeDM,2885
+stackit/serverbackup/models/create_backup_schedule_payload.py,sha256=1EIG5QqRyXzynmGd7Hpj8nAfab_YQff9IYgFgSWgSkQ,3688
+stackit/serverbackup/models/enable_service_resource_payload.py,sha256=bdMoblgD4Qm8yb54rEOeMEHWIT6h2MdbrQ3v0ZP_WYw,2585
+stackit/serverbackup/models/error_response.py,sha256=1awfFOVySGGdXnrS848TidKYmajdCtDp5HRP7BLUPts,2663
+stackit/serverbackup/models/get_backup_policies_response.py,sha256=sPz1wnMS0zkob_-Nca9CUtKNBoDUl6phQOotlKxSeIo,3039
+stackit/serverbackup/models/get_backup_schedules_response.py,sha256=wEs-js_3Q89-L8OR4r9XV6_u22wPVb22PG5mqaffbrk,3091
+stackit/serverbackup/models/get_backup_service_response.py,sha256=D_YHBzYIj496oLSpJdOBRiVMq35XcFrYBcXpAlT_kEs,2489
+stackit/serverbackup/models/get_backups_list_response.py,sha256=QFDlVMHu-srCaAWoa75ntT_W7p4R5TvnqoXc8FxKQks,2932
+stackit/serverbackup/models/restore_backup_payload.py,sha256=hV90oHUpwHIlPIYDwv91hgjZqqLp5FVnCuGqziPuQ30,2760
+stackit/serverbackup/models/restore_volume_backup_payload.py,sha256=qLjJoMbNHc7iSDo46Ufz5PE7X4-OZqEfik1-a7op4KA,2552
+stackit/serverbackup/models/update_backup_schedule_payload.py,sha256=HJYL8qWMch3G_dOEJGXGZPdnQB3Qv_64AdRzd1Iz7gE,3688
+stackit_serverbackup-1.2.0.dist-info/METADATA,sha256=eH5aUcDvWNGnAmIqwpLcO64kf0Mhz2hYk1Y-2lL4VEg,1712
+stackit_serverbackup-1.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+stackit_serverbackup-1.2.0.dist-info/licenses/LICENSE.md,sha256=3dF8Tb7yZn2tS4zyNa-yNe-68pH8qyWdGz4ioMd3MgE,10933
+stackit_serverbackup-1.2.0.dist-info/licenses/NOTICE.txt,sha256=0HfqD8VUMXY8GOdZEb24InnlD5YeNEBb6jVOMBwSX_E,65
+stackit_serverbackup-1.2.0.dist-info/RECORD,,

{stackit_serverbackup-1.1.1.dist-info → stackit_serverbackup-1.2.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.2.1
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any

stackit_serverbackup-1.1.1.dist-info/RECORD

@@ -1,33 +0,0 @@
-stackit/serverbackup/__init__.py,sha256=VG35es8cPZHtrEahl3jZkbYoO-Ij4yIeK85bleiiGpc,4053
-stackit/serverbackup/api/__init__.py,sha256=4gnwP89FX1nQYLr9Mg7TDzyxbWvl2JNyavFrb9moimM,107
-stackit/serverbackup/api/default_api.py,sha256=yeoTAHG_yBvaQYhSQ80duIEMd6WzMelD36N-5XELdm4,194803
-stackit/serverbackup/api_client.py,sha256=OdwtgbeD-N7rj_baPuDbYhsooEmf6iIakkepMghO01E,23376
-stackit/serverbackup/api_response.py,sha256=HRYkVqMNIlfODacTQPTbiVj2YdcnutpQrKJdeAoCSpM,642
-stackit/serverbackup/configuration.py,sha256=TGWzzKqb_W5ULS314KdI1klLZTeNi644caUcANc15-w,5719
-stackit/serverbackup/exceptions.py,sha256=nNghwkfLB34oT-vq9XKtuwkveYK-OGbyuxUNSTpRfgg,6437
-stackit/serverbackup/models/__init__.py,sha256=W8IO6b4B7HeyNAo4HT0XjS3AZ2UEM3VKD0j-r6EOmV4,1991
-stackit/serverbackup/models/backup.py,sha256=F_fRW0mnzLZ6uDjKMvmxt7sd8uset0i6kdL0v22LQGo,4623
-stackit/serverbackup/models/backup_job.py,sha256=JZrjA0iJqI47r2qYeNtnxJisuv1njpv1ERPwXxVVElw,2386
-stackit/serverbackup/models/backup_policy.py,sha256=XenNwg1BwLIiqnuX8tel3twxGw_GETCSFs--8mKI3FI,3679
-stackit/serverbackup/models/backup_policy_backup_properties.py,sha256=cV5YP9LE8tyTVKnVtNUv9z4z_7-lDOxZigr8afSgOlo,2660
-stackit/serverbackup/models/backup_properties.py,sha256=D02gHWRAbNxTPlst9dRN2FYkoXm_m-gMPgaeu6kfD9c,2869
-stackit/serverbackup/models/backup_schedule.py,sha256=G_ZivZYGWzaBavkbRycfWM_ZkfO_wqilJxHApdf7_ys,3362
-stackit/serverbackup/models/backup_volume_backups_inner.py,sha256=3TheiytC2oZejbvhd1YuyzJ7HS1kbfDT7yG9uQQ-m1Q,3974
-stackit/serverbackup/models/create_backup_payload.py,sha256=v5Z7yJ1xuElIBCQw4Lvcq4BlioqMIczStwp1OxvnrxE,2881
-stackit/serverbackup/models/create_backup_schedule_payload.py,sha256=iSaVWKHppMLxVIryuV0pnyHG5uTv9949eo3BjSd_Muk,3380
-stackit/serverbackup/models/enable_service_resource_payload.py,sha256=dVCbpHaIpWmkh7W2o7JoD5LwIaAqNxmR6yxkMEWQpo0,2575
-stackit/serverbackup/models/error_response.py,sha256=TYIjgHUfmB-AoicyqJgH7kP4ohHPw4skTjhxOrrpoF8,2659
-stackit/serverbackup/models/get_backup_policies_response.py,sha256=GAIEbnns87dv9ONZhlKtbDzcb2PIkCgGP485_U6KqXA,3017
-stackit/serverbackup/models/get_backup_schedules_response.py,sha256=JEC7glqxal01V0hBb2r_wVlKYa4D_umfQWS9OiYEruc,3069
-stackit/serverbackup/models/get_backup_service_response.py,sha256=8M1S4vF9rUbuQm3L3yx38unaAZLc7arAwu9gGYUsBac,2485
-stackit/serverbackup/models/get_backups_list_response.py,sha256=3MgMm3dz0x63pSkWEu9ME4gAyF4VDw0C8WGwZ5Hcl8s,2910
-stackit/serverbackup/models/restore_backup_payload.py,sha256=PmHkaRp3rooaVCuwECyQw4VhiUjq5sp8tFOfOccrIDI,2756
-stackit/serverbackup/models/restore_volume_backup_payload.py,sha256=3lp68tCMqjcixkxOWeSAF9BITGd19TToJ2_rXJRDRKc,2548
-stackit/serverbackup/models/update_backup_schedule_payload.py,sha256=ouMQkT84LjDJ1TJFbnTYunYxf3H4p9LGr2bMdVC2Y3g,3380
-stackit/serverbackup/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-stackit/serverbackup/rest.py,sha256=4RwHrhAj0YsNRjJ53vh83RTlQ3CrzGly4UYN2mRW-_o,5825
-stackit_serverbackup-1.1.1.dist-info/METADATA,sha256=wC-pr2j2sis_9sy21JgzmVMsTcEBuzg3PSu2nF6qFkI,1731
-stackit_serverbackup-1.1.1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-stackit_serverbackup-1.1.1.dist-info/licenses/LICENSE.md,sha256=3dF8Tb7yZn2tS4zyNa-yNe-68pH8qyWdGz4ioMd3MgE,10933
-stackit_serverbackup-1.1.1.dist-info/licenses/NOTICE.txt,sha256=0HfqD8VUMXY8GOdZEb24InnlD5YeNEBb6jVOMBwSX_E,65
-stackit_serverbackup-1.1.1.dist-info/RECORD,,