python3-core-api-client 1.0.1__py3-none-any.whl → 1.0.3__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
 
 
@@ -1550,6 +1578,7 @@ class PHPExtensionEnum(StrEnum):
     EXCIMER = "excimer"
     MAILPARSE = "mailparse"
     UV = "uv"
+    AMQP = "amqp"
 
 
 class PHPSettings(CoreApiModel):
@@ -1569,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=16)
+        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"

{python3_core_api_client-1.0.1.dist-info → python3_core_api_client-1.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-core-api-client
-Version: 1.0.1
+Version: 1.0.3
 Summary: Python client for Core API.
 Author-email: Cyberfusion <support@cyberfusion.io>
 Project-URL: Source, https://github.com/CyberfusionIO/python3-core-api-client

{python3_core_api_client-1.0.1.dist-info → python3_core_api_client-1.0.3.dist-info}/RECORD

@@ -4,7 +4,7 @@ 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=PGZlyBMaCgyar_ILM9hgJZukWIspSGT-1TcpaqFiBcw,267284
+cyberfusion/CoreApiClient/models.py,sha256=nk7VIt4LqEOQxXKB2QIztHKAVNvdZvXGdi5gTcksURk,268325
 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
@@ -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.1.dist-info/METADATA,sha256=nfU7o0rtVJ3rIMR3bJcbuhIrjFhRvR69z5IMAiUKO3w,7031
-python3_core_api_client-1.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-python3_core_api_client-1.0.1.dist-info/top_level.txt,sha256=ss011q9S6SL_KIIyq7iujFmIYa0grSjlnInO7cDkeag,12
-python3_core_api_client-1.0.1.dist-info/RECORD,,
+python3_core_api_client-1.0.3.dist-info/METADATA,sha256=mW06GlleEtvRcVYTeR8CHQ_tTYtDxDmsSmtQxzLBBXg,7031
+python3_core_api_client-1.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+python3_core_api_client-1.0.3.dist-info/top_level.txt,sha256=ss011q9S6SL_KIIyq7iujFmIYa0grSjlnInO7cDkeag,12
+python3_core_api_client-1.0.3.dist-info/RECORD,,