python3-core-api-client 1.0.2__py3-none-any.whl → 1.0.4__py3-none-any.whl

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):

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.dist-info → python3_core_api_client-1.0.4.dist-info}/METADATA

@@ -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.dist-info → python3_core_api_client-1.0.4.dist-info}/RECORD

@@ -4,14 +4,14 @@ cyberfusion/CoreApiClient/connector.py,sha256=7yQs9fH8ldGHpw41xHU07NkXD5OPm3_pjc
 cyberfusion/CoreApiClient/exceptions.py,sha256=fNxPtzVL4SzPiVNZmBTu1l8D57dkCxMxflyIXDPLE4Q,204
 cyberfusion/CoreApiClient/http.py,sha256=z6ZyfQyUnA3QDCmej2BEIw9BOlTYoCE8zvTZ0-u_VoQ,429
 cyberfusion/CoreApiClient/interfaces.py,sha256=P0wCbmSNEpB-eF49PHudc_qXM4blIXm4TsD2AB0z_7Q,269
-cyberfusion/CoreApiClient/models.py,sha256=bLs0A1Wulfud5bQEtGD_ax1gibAlICKPBzqlZHbAECs,267302
+cyberfusion/CoreApiClient/models.py,sha256=zYpoukhCTwfgb3sI-WcqGvFiPc38PgV8vU4g6cIUFw8,268346
 cyberfusion/CoreApiClient/resources/__init__.py,sha256=E5VMFXttOmN7TjJt0WeARL_tYVoJcLoRoOnIYkCF748,1881
 cyberfusion/CoreApiClient/resources/basic_authentication_realms.py,sha256=A0B4auQlBSV-kYrww613PwozMey-VsROguycrQBxB4E,2739
 cyberfusion/CoreApiClient/resources/borg_archives.py,sha256=Dj5seJanmRYZZFSnaagJBkfR7LL-uYO5vpbjody-y0g,4346
 cyberfusion/CoreApiClient/resources/borg_repositories.py,sha256=yXVQVU1NvgEdChybJdb9CmXt0tzMf5TdvcFClQKu-dQ,3970
 cyberfusion/CoreApiClient/resources/certificate_managers.py,sha256=-I8on9nFymCytq7HzBixMgVUqsPQ0O6-9kGY8JNHB7I,2997
 cyberfusion/CoreApiClient/resources/certificates.py,sha256=_ESvxxw1zw_DB1cqrL12nx4WYGBALMiLAt0vbZ7Wk5Q,1897
-cyberfusion/CoreApiClient/resources/clusters.py,sha256=zUL224DowliVug9qZ7y347UsG2bH0Qlb0OQnzykReGM,7004
+cyberfusion/CoreApiClient/resources/clusters.py,sha256=eR6wZLxWCzxV3ElTu7SPalMVMGmoicCuLtYDR_g1xGE,6700
 cyberfusion/CoreApiClient/resources/cmses.py,sha256=Z0gHxWV1Sm5WcNmZJwfxENntRaCY3ryOP6IJztiiy-I,8364
 cyberfusion/CoreApiClient/resources/crons.py,sha256=jvg4CsW4lKz1zoJ4hY1gkN8HuRvTM2CLYf0gQKnnIro,2152
 cyberfusion/CoreApiClient/resources/custom_config_snippets.py,sha256=va4xTVhp3bFDYM9DTsDKT7U-quA64k3lUgdVAX_zs6M,2748
@@ -53,7 +53,7 @@ cyberfusion/CoreApiClient/resources/tombstones.py,sha256=brtaywIKuIHfzrhAQSg8wtx
 cyberfusion/CoreApiClient/resources/unix_users.py,sha256=64j14_pfh4jWgM1hzJUYCicHcYQ7CT84cFzePCp0zTg,3622
 cyberfusion/CoreApiClient/resources/url_redirects.py,sha256=GBUin-MRtkuKk9191-8EsYc6iZf5X2cMOk_Y-xleW2s,2358
 cyberfusion/CoreApiClient/resources/virtual_hosts.py,sha256=ZwlymtfSp8sMtglm8iGrUb7wpw4cGtFU6h5b7HTu9Kw,3702
-python3_core_api_client-1.0.2.dist-info/METADATA,sha256=FYF2GGzdYCdloXo1Ua7H3uIZhun_eMI7kqp85A_VJsI,7031
-python3_core_api_client-1.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-python3_core_api_client-1.0.2.dist-info/top_level.txt,sha256=ss011q9S6SL_KIIyq7iujFmIYa0grSjlnInO7cDkeag,12
-python3_core_api_client-1.0.2.dist-info/RECORD,,
+python3_core_api_client-1.0.4.dist-info/METADATA,sha256=hwUpNy42DAjAtjKZqodyJpZRpPH9qpy0Jd2ThCG9Zrg,7031
+python3_core_api_client-1.0.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+python3_core_api_client-1.0.4.dist-info/top_level.txt,sha256=ss011q9S6SL_KIIyq7iujFmIYa0grSjlnInO7cDkeag,12
+python3_core_api_client-1.0.4.dist-info/RECORD,,