python3-core-api-client 1.0.2__tar.gz → 1.0.4__tar.gz

{python3_core_api_client-1.0.2 → python3_core_api_client-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-core-api-client
-Version: 1.0.2
+Version: 1.0.4
 Summary: Python client for Core API.
 Author-email: Cyberfusion <support@cyberfusion.io>
 Project-URL: Source, https://github.com/CyberfusionIO/python3-core-api-client
@@ -13,7 +13,7 @@ Requires-Dist: pydantic[dotenv,email]==1.10.4
 
 Python client for Core API.
 
-This client was built for and tested on the **1.241** version of the API.
+This client was built for and tested on the **1.246** version of the API.
 
 ## Support
 

{python3_core_api_client-1.0.2 → python3_core_api_client-1.0.4}/README.md

@@ -2,7 +2,7 @@
 
 Python client for Core API.
 
-This client was built for and tested on the **1.241** version of the API.
+This client was built for and tested on the **1.246** version of the API.
 
 ## Support
 

{python3_core_api_client-1.0.2 → python3_core_api_client-1.0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python3-core-api-client"
-version = "1.0.2"
+version = "1.0.4"
 description = "Python client for Core API."
 readme = "README.md"
 authors = [

{python3_core_api_client-1.0.2 → python3_core_api_client-1.0.4}/src/cyberfusion/CoreApiClient/models.py

@@ -3,15 +3,43 @@ from __future__ import annotations
 from datetime import datetime
 from enum import StrEnum, IntEnum
 from ipaddress import IPv4Address, IPv6Address
-from typing import Dict, List, Literal, Optional, Union
+from typing import Dict, List, Literal, Optional, Union, Any
 
 from pydantic import UUID4, AnyUrl, EmailStr, Field, confloat, conint, constr, BaseModel
+from typing import Iterator
 
 
 class CoreApiModel(BaseModel):
     pass
 
 
+class RootModelCollectionMixin:
+    """Mixin supporting iterating over and accessing items in a root model, without explicitly accessing __root__.
+
+    Inspired by https://docs.pydantic.dev/2.0/usage/models/#rootmodel-and-custom-root-types
+    """
+
+    __root__: dict | list | None
+
+    def __iter__(self) -> Iterator:
+        if not isinstance(self.__root__, (list, dict)):
+            raise TypeError("Type does not support iter")
+
+        return iter(self.__root__)
+
+    def __getitem__(self, item: Any) -> Any:
+        if not isinstance(self.__root__, (list, dict)):
+            raise TypeError("Type does not support getitem")
+
+        return self.__root__[item]
+
+    def items(self) -> Any:
+        if not isinstance(self.__root__, (dict)):
+            raise TypeError("Type does not support items")
+
+        return self.__root__.items()
+
+
 class APIUserAuthenticationMethod(StrEnum):
     API_KEY = "API Key"
     JWT_TOKEN = "JWT Token"
@@ -438,7 +466,7 @@ class ClusterIPAddress(CoreApiModel):
     l3_ddos_protection_enabled: bool = Field(..., title="L3 Ddos Protection Enabled")
 
 
-class ClusterIPAddresses(CoreApiModel):
+class ClusterIPAddresses(RootModelCollectionMixin, CoreApiModel):  # type: ignore[misc]
     __root__: Optional[Dict[str, Dict[str, List[ClusterIPAddress]]]] = None
 
 
@@ -634,7 +662,7 @@ class CustomerIPAddressDatabase(CoreApiModel):
     dns_name: Optional[str] = Field(..., title="Dns Name")
 
 
-class CustomerIPAddresses(CoreApiModel):
+class CustomerIPAddresses(RootModelCollectionMixin, CoreApiModel):  # type: ignore[misc]
     __root__: Optional[Dict[str, Dict[str, List[CustomerIPAddressDatabase]]]] = None
 
 
@@ -1380,7 +1408,7 @@ class MeilisearchEnvironmentEnum(StrEnum):
     DEVELOPMENT = "development"
 
 
-class NestedPathsDict(CoreApiModel):
+class NestedPathsDict(RootModelCollectionMixin, CoreApiModel):  # type: ignore[misc]
     __root__: Optional[Dict[str, Optional[NestedPathsDict]]] = None
 
 
@@ -1570,7 +1598,7 @@ class PHPSettings(CoreApiModel):
     post_max_size: conint(ge=32, le=256) = Field(32, title="Post Max Size")
     upload_max_filesize: conint(ge=32, le=256) = Field(32, title="Upload Max Filesize")
     tideways_api_key: Optional[
-        constr(regex=r"^[a-zA-Z0-9]+$", min_length=16, max_length=32)
+        constr(regex=r"^[a-zA-Z0-9_]+$", min_length=16, max_length=32)
     ] = Field(None, title="Tideways Api Key")
     tideways_sample_rate: Optional[conint(ge=1, le=100)] = Field(
         None, title="Tideways Sample Rate"
@@ -1929,7 +1957,7 @@ class TombstoneDataVirtualHost(CoreApiModel):
 
 
 class TombstoneIncludes(CoreApiModel):
-    pass
+    cluster: ClusterResource
 
 
 class TombstoneDataDatabase(CoreApiModel):

{python3_core_api_client-1.0.2 → python3_core_api_client-1.0.4}/src/cyberfusion/CoreApiClient/resources/clusters.py

@@ -83,17 +83,6 @@ class Clusters(Resource):
             ).json
         )
 
-    def delete_cluster(
-        self,
-        *,
-        id_: int,
-    ) -> models.DetailMessage:
-        return models.DetailMessage.parse_obj(
-            self.api_connector.send_or_fail(
-                "DELETE", f"/api/v1/clusters/{id_}", data=None, query_parameters={}
-            ).json
-        )
-
     def get_borg_ssh_key(
         self,
         *,

{python3_core_api_client-1.0.2 → python3_core_api_client-1.0.4}/src/python3_core_api_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-core-api-client
-Version: 1.0.2
+Version: 1.0.4
 Summary: Python client for Core API.
 Author-email: Cyberfusion <support@cyberfusion.io>
 Project-URL: Source, https://github.com/CyberfusionIO/python3-core-api-client
@@ -13,7 +13,7 @@ Requires-Dist: pydantic[dotenv,email]==1.10.4
 
 Python client for Core API.
 
-This client was built for and tested on the **1.241** version of the API.
+This client was built for and tested on the **1.246** version of the API.
 
 ## Support