python3-core-api-client 1.0.3__py3-none-any.whl → 1.0.5__py3-none-any.whl

cyberfusion/CoreApiClient/models.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from datetime import datetime
 from enum import StrEnum, IntEnum
 from ipaddress import IPv4Address, IPv6Address
@@ -1409,7 +1407,7 @@ class MeilisearchEnvironmentEnum(StrEnum):
 
 
 class NestedPathsDict(RootModelCollectionMixin, CoreApiModel):  # type: ignore[misc]
-    __root__: Optional[Dict[str, Optional[NestedPathsDict]]] = None
+    __root__: Optional[Dict[str, Optional["NestedPathsDict"]]] = None
 
 
 class NodeAddOnCreateRequest(CoreApiModel):
@@ -1598,7 +1596,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"
@@ -1884,114 +1882,6 @@ class TokenTypeEnum(StrEnum):
     BEARER = "bearer"
 
 
-class TombstoneDataCertificate(CoreApiModel):
-    data_type: Literal["certificate"] = Field(..., title="Data Type")
-
-
-class TombstoneDataCron(CoreApiModel):
-    data_type: Literal["cron"] = Field(..., title="Data Type")
-    name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=64) = Field(
-        ..., title="Name"
-    )
-    unix_user_id: int = Field(..., title="Unix User Id")
-
-
-class TombstoneDataDaemon(CoreApiModel):
-    data_type: Literal["daemon"] = Field(..., title="Data Type")
-    name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=64) = Field(
-        ..., title="Name"
-    )
-
-
-class TombstoneDataFPMPool(CoreApiModel):
-    data_type: Literal["fpm_pool"] = Field(..., title="Data Type")
-    version: str = Field(..., title="Version")
-    name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=64) = Field(
-        ..., title="Name"
-    )
-
-
-class TombstoneDataMailAccount(CoreApiModel):
-    data_type: Literal["mail_account"] = Field(..., title="Data Type")
-    local_part: constr(regex=r"^[a-z0-9-.]+$", min_length=1, max_length=64) = Field(
-        ...,
-        description="May not be in use by mail alias in the same mail domain.",
-        title="Local Part",
-    )
-    mail_domain_id: int = Field(..., title="Mail Domain Id")
-    delete_on_cluster: Optional[bool] = Field(False, title="Delete On Cluster")
-
-
-class TombstoneDataPassengerApp(CoreApiModel):
-    data_type: Literal["passenger_app"] = Field(..., title="Data Type")
-    name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=64) = Field(
-        ..., title="Name"
-    )
-
-
-class TombstoneDataRedisInstance(CoreApiModel):
-    data_type: Literal["redis_instance"] = Field(..., title="Data Type")
-    name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=64) = Field(
-        ..., title="Name"
-    )
-    delete_on_cluster: Optional[bool] = Field(False, title="Delete On Cluster")
-
-
-class TombstoneDataUNIXUser(CoreApiModel):
-    data_type: Literal["unix_user"] = Field(..., title="Data Type")
-    home_directory: str = Field(..., title="Home Directory")
-    delete_on_cluster: Optional[bool] = Field(False, title="Delete On Cluster")
-
-
-class TombstoneDataUNIXUserRabbitMQCredentials(CoreApiModel):
-    data_type: Literal["unix_user_rabbitmq_credentials"] = Field(..., title="Data Type")
-    rabbitmq_virtual_host_name: constr(
-        regex=r"^[a-z0-9-.]+$", min_length=1, max_length=32
-    ) = Field(..., title="Rabbitmq Virtual Host Name")
-
-
-class TombstoneDataVirtualHost(CoreApiModel):
-    data_type: Literal["virtual_host"] = Field(..., title="Data Type")
-    domain_root: str = Field(..., title="Domain Root")
-    delete_on_cluster: Optional[bool] = Field(False, title="Delete On Cluster")
-
-
-class TombstoneIncludes(CoreApiModel):
-    pass
-
-
-class TombstoneDataDatabase(CoreApiModel):
-    data_type: Literal["database"] = Field(..., title="Data Type")
-    name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=63) = Field(
-        ..., title="Name"
-    )
-    server_software_name: DatabaseServerSoftwareNameEnum
-    delete_on_cluster: Optional[bool] = Field(False, title="Delete On Cluster")
-
-
-class TombstoneResource(CoreApiModel):
-    id: int = Field(..., title="Id")
-    created_at: datetime = Field(..., title="Created At")
-    updated_at: datetime = Field(..., title="Updated At")
-    data: Union[
-        TombstoneDataPassengerApp,
-        TombstoneDataCertificate,
-        TombstoneDataFPMPool,
-        TombstoneDataUNIXUserRabbitMQCredentials,
-        TombstoneDataUNIXUser,
-        TombstoneDataCron,
-        TombstoneDataDaemon,
-        TombstoneDataDatabase,
-        TombstoneDataMailAccount,
-        TombstoneDataRedisInstance,
-        TombstoneDataVirtualHost,
-    ] = Field(..., discriminator="data_type", title="Data")
-    object_id: int = Field(..., title="Object Id")
-    object_model_name: ObjectModelNameEnum
-    cluster_id: int = Field(..., title="Cluster Id")
-    includes: TombstoneIncludes
-
-
 class UNIXUserComparison(CoreApiModel):
     not_identical_paths: NestedPathsDict
     only_left_files_paths: NestedPathsDict
@@ -5374,4 +5264,112 @@ class MailAliasResource(CoreApiModel):
     includes: MailAliasIncludes
 
 
+class TombstoneDataCertificate(CoreApiModel):
+    data_type: Literal["certificate"] = Field(..., title="Data Type")
+
+
+class TombstoneDataCron(CoreApiModel):
+    data_type: Literal["cron"] = Field(..., title="Data Type")
+    name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=64) = Field(
+        ..., title="Name"
+    )
+    unix_user_id: int = Field(..., title="Unix User Id")
+
+
+class TombstoneDataDaemon(CoreApiModel):
+    data_type: Literal["daemon"] = Field(..., title="Data Type")
+    name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=64) = Field(
+        ..., title="Name"
+    )
+
+
+class TombstoneDataFPMPool(CoreApiModel):
+    data_type: Literal["fpm_pool"] = Field(..., title="Data Type")
+    version: str = Field(..., title="Version")
+    name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=64) = Field(
+        ..., title="Name"
+    )
+
+
+class TombstoneDataMailAccount(CoreApiModel):
+    data_type: Literal["mail_account"] = Field(..., title="Data Type")
+    local_part: constr(regex=r"^[a-z0-9-.]+$", min_length=1, max_length=64) = Field(
+        ...,
+        description="May not be in use by mail alias in the same mail domain.",
+        title="Local Part",
+    )
+    mail_domain_id: int = Field(..., title="Mail Domain Id")
+    delete_on_cluster: Optional[bool] = Field(False, title="Delete On Cluster")
+
+
+class TombstoneDataPassengerApp(CoreApiModel):
+    data_type: Literal["passenger_app"] = Field(..., title="Data Type")
+    name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=64) = Field(
+        ..., title="Name"
+    )
+
+
+class TombstoneDataRedisInstance(CoreApiModel):
+    data_type: Literal["redis_instance"] = Field(..., title="Data Type")
+    name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=64) = Field(
+        ..., title="Name"
+    )
+    delete_on_cluster: Optional[bool] = Field(False, title="Delete On Cluster")
+
+
+class TombstoneDataUNIXUser(CoreApiModel):
+    data_type: Literal["unix_user"] = Field(..., title="Data Type")
+    home_directory: str = Field(..., title="Home Directory")
+    delete_on_cluster: Optional[bool] = Field(False, title="Delete On Cluster")
+
+
+class TombstoneDataUNIXUserRabbitMQCredentials(CoreApiModel):
+    data_type: Literal["unix_user_rabbitmq_credentials"] = Field(..., title="Data Type")
+    rabbitmq_virtual_host_name: constr(
+        regex=r"^[a-z0-9-.]+$", min_length=1, max_length=32
+    ) = Field(..., title="Rabbitmq Virtual Host Name")
+
+
+class TombstoneDataVirtualHost(CoreApiModel):
+    data_type: Literal["virtual_host"] = Field(..., title="Data Type")
+    domain_root: str = Field(..., title="Domain Root")
+    delete_on_cluster: Optional[bool] = Field(False, title="Delete On Cluster")
+
+
+class TombstoneIncludes(CoreApiModel):
+    cluster: ClusterResource
+
+
+class TombstoneDataDatabase(CoreApiModel):
+    data_type: Literal["database"] = Field(..., title="Data Type")
+    name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=63) = Field(
+        ..., title="Name"
+    )
+    server_software_name: DatabaseServerSoftwareNameEnum
+    delete_on_cluster: Optional[bool] = Field(False, title="Delete On Cluster")
+
+
+class TombstoneResource(CoreApiModel):
+    id: int = Field(..., title="Id")
+    created_at: datetime = Field(..., title="Created At")
+    updated_at: datetime = Field(..., title="Updated At")
+    data: Union[
+        TombstoneDataPassengerApp,
+        TombstoneDataCertificate,
+        TombstoneDataFPMPool,
+        TombstoneDataUNIXUserRabbitMQCredentials,
+        TombstoneDataUNIXUser,
+        TombstoneDataCron,
+        TombstoneDataDaemon,
+        TombstoneDataDatabase,
+        TombstoneDataMailAccount,
+        TombstoneDataRedisInstance,
+        TombstoneDataVirtualHost,
+    ] = Field(..., discriminator="data_type", title="Data")
+    object_id: int = Field(..., title="Object Id")
+    object_model_name: ObjectModelNameEnum
+    cluster_id: int = Field(..., title="Cluster Id")
+    includes: TombstoneIncludes
+
+
 NestedPathsDict.update_forward_refs()

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-core-api-client
-Version: 1.0.3
+Version: 1.0.5
 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.3.dist-info → python3_core_api_client-1.0.5.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=nk7VIt4LqEOQxXKB2QIztHKAVNvdZvXGdi5gTcksURk,268325
+cyberfusion/CoreApiClient/models.py,sha256=beU_mWfJZJAkEUFbwzHyBAATuLDwpttiYNeaDTshVcM,268312
 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.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,,
+python3_core_api_client-1.0.5.dist-info/METADATA,sha256=vRmSUAdjDW3-BKCMn5bWdBzflekVhaRq_laU-3Krr-c,7031
+python3_core_api_client-1.0.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+python3_core_api_client-1.0.5.dist-info/top_level.txt,sha256=ss011q9S6SL_KIIyq7iujFmIYa0grSjlnInO7cDkeag,12
+python3_core_api_client-1.0.5.dist-info/RECORD,,