python3-core-api-client 1.0.6__tar.gz → 1.1.0__tar.gz

{python3_core_api_client-1.0.6 → python3_core_api_client-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-core-api-client
-Version: 1.0.6
+Version: 1.1.0
 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.246** version of the API.
+This client was built for and tested on the **1.248** version of the API.
 
 ## Support
 
@@ -250,11 +250,11 @@ To raise `cyberfusion.CoreApiClient.exceptions.CallException` in case of an unex
 
 Auto-generate models as follows:
 
-    datamodel-codegen --input-file-type openapi --input $file --output src/cyberfusion/CoreApiClient/models.py --target-python-version 3.11
+    datamodel-codegen --input-file-type openapi --url http://127.0.0.1:22190/openapi.json --output temp_models.py --target-python-version 3.11
 
-Replace `$file` by the path to the OpenAPI spec (JSON).
+This adds models to `temp_models.py`. Merge it with `models.py`.
 
-Note: don't replace `models.py` in full - it contains customisations.
+To not use a local Core API instance, replace `--url` by `--input`. Pass the path to the OpenAPI spec (JSON).
 
 # Test strategy
 

{python3_core_api_client-1.0.6 → python3_core_api_client-1.1.0}/README.md

@@ -2,7 +2,7 @@
 
 Python client for Core API.
 
-This client was built for and tested on the **1.246** version of the API.
+This client was built for and tested on the **1.248** version of the API.
 
 ## Support
 
@@ -239,11 +239,11 @@ To raise `cyberfusion.CoreApiClient.exceptions.CallException` in case of an unex
 
 Auto-generate models as follows:
 
-    datamodel-codegen --input-file-type openapi --input $file --output src/cyberfusion/CoreApiClient/models.py --target-python-version 3.11
+    datamodel-codegen --input-file-type openapi --url http://127.0.0.1:22190/openapi.json --output temp_models.py --target-python-version 3.11
 
-Replace `$file` by the path to the OpenAPI spec (JSON).
+This adds models to `temp_models.py`. Merge it with `models.py`.
 
-Note: don't replace `models.py` in full - it contains customisations.
+To not use a local Core API instance, replace `--url` by `--input`. Pass the path to the OpenAPI spec (JSON).
 
 # Test strategy
 

{python3_core_api_client-1.0.6 → python3_core_api_client-1.1.0}/pyproject.toml

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

{python3_core_api_client-1.0.6 → python3_core_api_client-1.1.0}/src/cyberfusion/CoreApiClient/models.py

@@ -38,6 +38,28 @@ class RootModelCollectionMixin:
         return self.__root__.items()
 
 
+class ObjectLogTypeEnum(StrEnum):
+    Create = "Create"
+    Update = "Update"
+    Delete = "Delete"
+
+
+class CauserTypeEnum(StrEnum):
+    API_User = "API User"
+
+
+class HTTPMethod(StrEnum):
+    CONNECT = "CONNECT"
+    DELETE = "DELETE"
+    GET = "GET"
+    HEAD = "HEAD"
+    OPTIONS = "OPTIONS"
+    PATCH = "PATCH"
+    POST = "POST"
+    PUT = "PUT"
+    TRACE = "TRACE"
+
+
 class APIUserAuthenticationMethod(StrEnum):
     API_KEY = "API Key"
     JWT_TOKEN = "JWT Token"
@@ -510,7 +532,7 @@ class CronCreateRequest(CoreApiModel):
         title="Locking Enabled",
     )
     is_active: bool = Field(..., title="Is Active")
-    memory_limit: Optional[conint(ge=256, le=4096)] = Field(
+    memory_limit: Optional[conint(ge=256)] = Field(
         None,
         description="In MB.\n\nWhen the memory limit is reached, the daemon is restarted.\n\nUse this to prevent a daemon from overloading an entire cluster ('noisy neighbour effect'). Also see `cpu_limit`.",
         title="Memory Limit",
@@ -599,7 +621,7 @@ class CronUpdateRequest(CoreApiModel):
         title="Locking Enabled",
     )
     is_active: Optional[bool] = Field(None, title="Is Active")
-    memory_limit: Optional[conint(ge=256, le=4096)] = Field(
+    memory_limit: Optional[conint(ge=256)] = Field(
         None,
         description="In MB.\n\nWhen the memory limit is reached, the daemon is restarted.\n\nUse this to prevent a daemon from overloading an entire cluster ('noisy neighbour effect'). Also see `cpu_limit`.",
         title="Memory Limit",
@@ -609,6 +631,11 @@ class CronUpdateRequest(CoreApiModel):
         description="Each step of `100` means 1 CPU core. For example, a value of `200` means 2 CPU cores.\n\nUse this to prevent a daemon from overloading an entire cluster ('noisy neighbour effect'). Also see `memory_limit`.",
         title="Cpu Limit",
     )
+    node_id: Optional[int] = Field(
+        None,
+        description="The node this cron will run on.\n\nDefaults to node with Admin group.",
+        title="Node Id",
+    )
 
 
 class CustomConfigServerSoftwareNameEnum(StrEnum):
@@ -692,7 +719,7 @@ class DaemonCreateRequest(CoreApiModel):
         ..., title="Command"
     )
     nodes_ids: List[int] = Field(..., min_items=1, title="Nodes Ids", unique_items=True)
-    memory_limit: Optional[conint(ge=256, le=4096)] = Field(
+    memory_limit: Optional[conint(ge=256)] = Field(
         None,
         description="In MB.\n\nWhen the memory limit is reached, the daemon is restarted.\n\nUse this to prevent a daemon from overloading an entire cluster ('noisy neighbour effect'). Also see `cpu_limit`.",
         title="Memory Limit",
@@ -722,7 +749,7 @@ class DaemonUpdateRequest(CoreApiModel):
         Field(None, title="Command")
     )
     nodes_ids: Optional[List[int]] = Field(None, title="Nodes Ids")
-    memory_limit: Optional[conint(ge=256, le=4096)] = Field(
+    memory_limit: Optional[conint(ge=256)] = Field(
         None,
         description="In MB.\n\nWhen the memory limit is reached, the daemon is restarted.\n\nUse this to prevent a daemon from overloading an entire cluster ('noisy neighbour effect'). Also see `cpu_limit`.",
         title="Memory Limit",
@@ -939,7 +966,7 @@ class FPMPoolCreateRequest(CoreApiModel):
         description="Apply multiple security measures, most notably:\n\n- Dedicated special devices (`/dev/`)\n- When the cluster UNIX user home directory is `/home`, other directories are hidden. This ensures usernames of other UNIX users are not leaked.\n\nThis setting is recommended for shared environments in which users are not trusted.\n",
         title="Is Namespaced",
     )
-    memory_limit: Optional[conint(ge=256, le=4096)] = Field(
+    memory_limit: Optional[conint(ge=256)] = Field(
         None,
         description="In MB.\n\nWhen the memory limit is reached, the FPM pool is restarted.\n\nUse this to prevent an FPM pool from overloading an entire cluster ('noisy neighbour effect'). Also see `cpu_limit`.",
         title="Memory Limit",
@@ -1023,7 +1050,7 @@ class FPMPoolUpdateRequest(CoreApiModel):
         description="Apply multiple security measures, most notably:\n\n- Dedicated special devices (`/dev/`)\n- When the cluster UNIX user home directory is `/home`, other directories are hidden. This ensures usernames of other UNIX users are not leaked.\n\nThis setting is recommended for shared environments in which users are not trusted.\n",
         title="Is Namespaced",
     )
-    memory_limit: Optional[conint(ge=256, le=4096)] = Field(
+    memory_limit: Optional[conint(ge=256)] = Field(
         None,
         description="In MB.\n\nWhen the memory limit is reached, the FPM pool is restarted.\n\nUse this to prevent an FPM pool from overloading an entire cluster ('noisy neighbour effect'). Also see `cpu_limit`.",
         title="Memory Limit",
@@ -1425,9 +1452,9 @@ class NodeAddOnProduct(CoreApiModel):
     name: constr(regex=r"^[a-zA-Z0-9 ]+$", min_length=1, max_length=64) = Field(
         ..., title="Name"
     )
-    ram: Optional[int] = Field(..., title="Ram")
-    cores: Optional[int] = Field(..., title="Cores")
-    disk: Optional[int] = Field(..., title="Disk")
+    memory_gib: Optional[int] = Field(..., title="Memory Gib")
+    cpu_cores: Optional[int] = Field(..., title="Cpu Cores")
+    disk_gib: Optional[int] = Field(..., title="Disk Gib")
     price: confloat(ge=0.0) = Field(..., title="Price")
     period: constr(regex=r"^[A-Z0-9]+$", min_length=2, max_length=2) = Field(
         ..., title="Period"
@@ -1483,9 +1510,9 @@ class NodeProduct(CoreApiModel):
     name: constr(regex=r"^[A-Z]+$", min_length=1, max_length=2) = Field(
         ..., title="Name"
     )
-    ram: int = Field(..., title="Ram")
-    cores: int = Field(..., title="Cores")
-    disk: int = Field(..., title="Disk")
+    memory_gib: int = Field(..., title="Memory Gib")
+    cpu_cores: int = Field(..., title="Cpu Cores")
+    disk_gib: int = Field(..., title="Disk Gib")
     allow_upgrade_to: List[constr(regex=r"^[A-Z]+$", min_length=1, max_length=2)] = (
         Field(..., title="Allow Upgrade To")
     )
@@ -1577,6 +1604,7 @@ class PHPExtensionEnum(StrEnum):
     MAILPARSE = "mailparse"
     UV = "uv"
     AMQP = "amqp"
+    MONGODB = "mongodb"
 
 
 class PHPSettings(CoreApiModel):
@@ -1634,9 +1662,7 @@ class RedisInstanceCreateRequest(CoreApiModel):
     password: constr(regex=r"^[a-zA-Z0-9]+$", min_length=24, max_length=255) = Field(
         ..., title="Password"
     )
-    memory_limit: conint(ge=8, le=4096) = Field(
-        ..., description="In MB.", title="Memory Limit"
-    )
+    memory_limit: conint(ge=8) = Field(..., description="In MB.", title="Memory Limit")
     max_databases: int = Field(..., title="Max Databases")
     eviction_policy: RedisEvictionPolicyEnum = Field(
         ...,
@@ -1654,9 +1680,7 @@ class RedisInstanceUpdateDeprecatedRequest(CoreApiModel):
     password: constr(regex=r"^[a-zA-Z0-9]+$", min_length=24, max_length=255) = Field(
         ..., title="Password"
     )
-    memory_limit: conint(ge=8, le=4096) = Field(
-        ..., description="In MB.", title="Memory Limit"
-    )
+    memory_limit: conint(ge=8) = Field(..., description="In MB.", title="Memory Limit")
     max_databases: int = Field(..., title="Max Databases")
     eviction_policy: RedisEvictionPolicyEnum = Field(
         ...,
@@ -1668,7 +1692,7 @@ class RedisInstanceUpdateRequest(CoreApiModel):
     password: Optional[
         constr(regex=r"^[a-zA-Z0-9]+$", min_length=24, max_length=255)
     ] = Field(None, title="Password")
-    memory_limit: Optional[conint(ge=8, le=4096)] = Field(
+    memory_limit: Optional[conint(ge=8)] = Field(
         None, description="In MB.", title="Memory Limit"
     )
     max_databases: Optional[int] = Field(None, title="Max Databases")
@@ -3872,7 +3896,7 @@ class IPAddressProduct(CoreApiModel):
     )
 
 
-class LogAccessResource(CoreApiModel):
+class WebServerLogAccessResource(CoreApiModel):
     remote_address: str = Field(..., title="Remote Address")
     raw_message: constr(min_length=1, max_length=65535) = Field(
         ..., title="Raw Message"
@@ -3884,7 +3908,7 @@ class LogAccessResource(CoreApiModel):
     bytes_sent: conint(ge=0) = Field(..., title="Bytes Sent")
 
 
-class LogErrorResource(CoreApiModel):
+class WebServerLogErrorResource(CoreApiModel):
     remote_address: str = Field(..., title="Remote Address")
     raw_message: constr(min_length=1, max_length=65535) = Field(
         ..., title="Raw Message"
@@ -3917,6 +3941,25 @@ class MariaDBEncryptionKeyResource(CoreApiModel):
     includes: MariaDBEncryptionKeyIncludes
 
 
+class NodeGroupDependency(CoreApiModel):
+    is_dependency: bool = Field(
+        ...,
+        description="Will the service become unavailable when this node is unreachable?",
+        title="Is Dependency",
+    )
+    impact: Optional[str] = Field(
+        ...,
+        description="What impact will this node becoming unreachable have?",
+        title="Impact",
+    )
+    reason: str = Field(
+        ...,
+        description="Why will the node being unreachable have impact?",
+        title="Reason",
+    )
+    group: NodeGroupEnum
+
+
 class NodeGroupsProperties(CoreApiModel):
     Redis: Optional[NodeRedisGroupProperties]
     MariaDB: Optional[NodeMariaDBGroupProperties]
@@ -4161,9 +4204,7 @@ class RedisInstanceResource(CoreApiModel):
     password: constr(regex=r"^[a-zA-Z0-9]+$", min_length=24, max_length=255) = Field(
         ..., title="Password"
     )
-    memory_limit: conint(ge=8, le=4096) = Field(
-        ..., description="In MB.", title="Memory Limit"
-    )
+    memory_limit: conint(ge=8) = Field(..., description="In MB.", title="Memory Limit")
     max_databases: int = Field(..., title="Max Databases")
     eviction_policy: RedisEvictionPolicyEnum = Field(
         ...,
@@ -4564,7 +4605,7 @@ class CronResource(CoreApiModel):
         title="Locking Enabled",
     )
     is_active: bool = Field(..., title="Is Active")
-    memory_limit: Optional[conint(ge=256, le=4096)] = Field(
+    memory_limit: Optional[conint(ge=256)] = Field(
         ..., description="In MB.", title="Memory Limit"
     )
     cpu_limit: Optional[int] = Field(
@@ -4593,7 +4634,7 @@ class DaemonResource(CoreApiModel):
         ..., title="Command"
     )
     nodes_ids: List[int] = Field(..., min_items=1, title="Nodes Ids", unique_items=True)
-    memory_limit: Optional[conint(ge=256, le=4096)] = Field(
+    memory_limit: Optional[conint(ge=256)] = Field(
         ..., description="In MB.", title="Memory Limit"
     )
     cpu_limit: Optional[int] = Field(
@@ -4683,7 +4724,7 @@ class FPMPoolResource(CoreApiModel):
         description="Apply multiple security measures, most notably:\n\n- Dedicated special devices (`/dev/`)\n- When the cluster UNIX user home directory is `/home`, other directories are hidden. This ensures usernames of other UNIX users are not leaked.\n\nThis setting is recommended for shared environments in which users are not trusted.\n",
         title="Is Namespaced",
     )
-    memory_limit: Optional[conint(ge=256, le=4096)] = Field(
+    memory_limit: Optional[conint(ge=256)] = Field(
         ..., description="In MB.", title="Memory Limit"
     )
     includes: FPMPoolIncludes
@@ -4932,6 +4973,63 @@ class NodeCreateRequest(CoreApiModel):
     )
 
 
+class NodeCronDependency(CoreApiModel):
+    is_dependency: bool = Field(
+        ...,
+        description="Will the service become unavailable when this node is unreachable?",
+        title="Is Dependency",
+    )
+    impact: Optional[str] = Field(
+        ...,
+        description="What impact will this node becoming unreachable have?",
+        title="Impact",
+    )
+    reason: str = Field(
+        ...,
+        description="Why will the node being unreachable have impact?",
+        title="Reason",
+    )
+    cron: CronResource
+
+
+class NodeDaemonDependency(CoreApiModel):
+    is_dependency: bool = Field(
+        ...,
+        description="Will the service become unavailable when this node is unreachable?",
+        title="Is Dependency",
+    )
+    impact: Optional[str] = Field(
+        ...,
+        description="What impact will this node becoming unreachable have?",
+        title="Impact",
+    )
+    reason: str = Field(
+        ...,
+        description="Why will the node being unreachable have impact?",
+        title="Reason",
+    )
+    daemon: DaemonResource
+
+
+class NodeHostsEntryDependency(CoreApiModel):
+    is_dependency: bool = Field(
+        ...,
+        description="Will the service become unavailable when this node is unreachable?",
+        title="Is Dependency",
+    )
+    impact: Optional[str] = Field(
+        ...,
+        description="What impact will this node becoming unreachable have?",
+        title="Impact",
+    )
+    reason: str = Field(
+        ...,
+        description="Why will the node being unreachable have impact?",
+        title="Reason",
+    )
+    hosts_entry: HostsEntryResource
+
+
 class PassengerAppIncludes(CoreApiModel):
     unix_user: UNIXUserResource
     cluster: ClusterResource
@@ -5264,16 +5362,156 @@ class MailAliasResource(CoreApiModel):
     includes: MailAliasIncludes
 
 
-class TombstoneDataCertificate(CoreApiModel):
-    data_type: Literal["certificate"] = Field(..., title="Data Type")
+class NodeDomainRouterDependency(CoreApiModel):
+    is_dependency: bool = Field(
+        ...,
+        description="Will the service become unavailable when this node is unreachable?",
+        title="Is Dependency",
+    )
+    impact: Optional[str] = Field(
+        ...,
+        description="What impact will this node becoming unreachable have?",
+        title="Impact",
+    )
+    reason: str = Field(
+        ...,
+        description="Why will the node being unreachable have impact?",
+        title="Reason",
+    )
+    domain_router: DomainRouterResource
 
 
-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(
+class TombstoneDataCertificateIncludes(BaseModel):
+    pass
+
+
+class TombstoneDataDaemonIncludes(BaseModel):
+    pass
+
+
+class TombstoneDataDatabaseIncludes(BaseModel):
+    pass
+
+
+class TombstoneDataFPMPoolIncludes(BaseModel):
+    pass
+
+
+class TombstoneDataPassengerAppIncludes(BaseModel):
+    pass
+
+
+class TombstoneDataRedisInstanceIncludes(BaseModel):
+    pass
+
+
+class TombstoneDataUNIXUserIncludes(BaseModel):
+    pass
+
+
+class TombstoneDataUNIXUserRabbitMQCredentialsIncludes(BaseModel):
+    pass
+
+
+class TombstoneDataVirtualHostIncludes(BaseModel):
+    pass
+
+
+class TombstoneDataDatabaseUserIncludes(BaseModel):
+    pass
+
+
+class TombstoneDataDomainRouterIncludes(BaseModel):
+    pass
+
+
+class TombstoneDataRootSSHKeyIncludes(BaseModel):
+    pass
+
+
+class TombstoneDataSSHKeyIncludes(BaseModel):
+    pass
+
+
+class TombstoneDataMailHostnameIncludes(BaseModel):
+    pass
+
+
+class TombstoneDataDatabaseUser(BaseModel):
+    data_type: Literal["database_user"] = Field(..., const=True, title="Data Type")
+    name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=63) = Field(
         ..., title="Name"
     )
-    unix_user_id: int = Field(..., title="Unix User Id")
+    host: Optional[HostEnum]
+    server_software_name: DatabaseServerSoftwareNameEnum
+    includes: TombstoneDataDatabaseUserIncludes
+
+
+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")
+    includes: TombstoneDataDatabaseIncludes
+
+
+class TombstoneDataDatabaseUserGrantIncludes(BaseModel):
+    database: Union[DatabaseResource, TombstoneDataDatabase] = Field(
+        ..., title="Database"
+    )
+    database_user: Union[DatabaseUserResource, TombstoneDataDatabaseUser] = Field(
+        ..., title="Database User"
+    )
+
+
+class TombstoneDataDatabaseUserGrant(BaseModel):
+    data_type: Literal["database_user_grant"] = Field(
+        ..., const=True, title="Data Type"
+    )
+    table_name: Optional[
+        constr(regex=r"^[a-zA-Z0-9-_]+$", min_length=1, max_length=64)
+    ] = Field(..., title="Table Name")
+    privilege_name: MariaDBPrivilegeEnum
+    database_id: int = Field(..., title="Database Id")
+    database_user_id: int = Field(..., title="Database User Id")
+    includes: TombstoneDataDatabaseUserGrantIncludes
+
+
+class TombstoneDataDomainRouter(BaseModel):
+    data_type: Literal["domain_router"] = Field(..., const=True, title="Data Type")
+    domain: str = Field(..., title="Domain")
+    includes: TombstoneDataDomainRouterIncludes
+
+
+class TombstoneDataRootSSHKey(BaseModel):
+    data_type: Literal["root_ssh_key"] = Field(..., const=True, title="Data Type")
+    name: constr(regex=r"^[a-zA-Z0-9-_]+$", min_length=1, max_length=64) = Field(
+        ..., title="Name"
+    )
+    is_private_key: bool = Field(..., title="Is Private Key")
+    includes: TombstoneDataRootSSHKeyIncludes
+
+
+class TombstoneDataSSHKey(BaseModel):
+    data_type: Literal["ssh_key"] = Field(..., const=True, title="Data Type")
+    name: constr(regex=r"^[a-zA-Z0-9-_]+$", min_length=1, max_length=64) = Field(
+        ..., title="Name"
+    )
+    identity_file_path: Optional[str] = Field(..., title="Identity File Path")
+    includes: TombstoneDataSSHKeyIncludes
+
+
+class TombstoneDataMailHostname(BaseModel):
+    data_type: Literal["mail_hostname"] = Field(..., const=True, title="Data Type")
+    domain: str = Field(..., title="Domain")
+    includes: TombstoneDataMailHostnameIncludes
+
+
+class TombstoneDataCertificate(CoreApiModel):
+    data_type: Literal["certificate"] = Field(..., title="Data Type")
+    includes: TombstoneDataCertificateIncludes
 
 
 class TombstoneDataDaemon(CoreApiModel):
@@ -5281,6 +5519,8 @@ class TombstoneDataDaemon(CoreApiModel):
     name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=64) = Field(
         ..., title="Name"
     )
+    nodes_ids: List[int] = Field(..., min_items=1, title="Nodes Ids", unique_items=True)
+    includes: TombstoneDataDaemonIncludes
 
 
 class TombstoneDataFPMPool(CoreApiModel):
@@ -5289,17 +5529,7 @@ class TombstoneDataFPMPool(CoreApiModel):
     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")
+    includes: TombstoneDataFPMPoolIncludes
 
 
 class TombstoneDataPassengerApp(CoreApiModel):
@@ -5307,6 +5537,9 @@ class TombstoneDataPassengerApp(CoreApiModel):
     name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=64) = Field(
         ..., title="Name"
     )
+    app_root: str = Field(..., title="App Root")
+    delete_on_cluster: Optional[bool] = Field(False, title="Delete On Cluster")
+    includes: TombstoneDataPassengerAppIncludes
 
 
 class TombstoneDataRedisInstance(CoreApiModel):
@@ -5315,12 +5548,76 @@ class TombstoneDataRedisInstance(CoreApiModel):
         ..., title="Name"
     )
     delete_on_cluster: Optional[bool] = Field(False, title="Delete On Cluster")
+    includes: TombstoneDataRedisInstanceIncludes
 
 
 class TombstoneDataUNIXUser(CoreApiModel):
     data_type: Literal["unix_user"] = Field(..., title="Data Type")
     home_directory: str = Field(..., title="Home Directory")
+    mail_domains_directory: Optional[str] = Field(..., title="Mail Domains Directory")
     delete_on_cluster: Optional[bool] = Field(False, title="Delete On Cluster")
+    includes: TombstoneDataUNIXUserIncludes
+
+
+class TombstoneDataCronIncludes(BaseModel):
+    node: NodeResource
+    unix_user: Union[TombstoneDataUNIXUser, UNIXUserResource] = Field(
+        ..., title="Unix User"
+    )
+
+
+class TombstoneDataHtpasswdFileIncludes(BaseModel):
+    unix_user: Union[UNIXUserResource, TombstoneDataUNIXUser] = Field(
+        ..., title="Unix User"
+    )
+
+
+class TombstoneDataHtpasswdFile(BaseModel):
+    data_type: Literal["htpasswd_file"] = Field(..., const=True, title="Data Type")
+    unix_user_id: int = Field(..., title="Unix User Id")
+    includes: TombstoneDataHtpasswdFileIncludes
+
+
+class TombstoneDataMailDomainIncludes(BaseModel):
+    unix_user: Union[UNIXUserResource, TombstoneDataUNIXUser] = Field(
+        ..., title="Unix User"
+    )
+
+
+class TombstoneDataMailDomain(BaseModel):
+    data_type: Literal["mail_domain"] = Field(..., const=True, title="Data Type")
+    domain: str = Field(..., title="Domain")
+    unix_user_id: int = Field(..., title="Unix User Id")
+    delete_on_cluster: Optional[bool] = Field(False, title="Delete On Cluster")
+    includes: TombstoneDataMailDomainIncludes
+
+
+class TombstoneDataMailAccountIncludes(BaseModel):
+    mail_domain: Union[MailDomainResource, TombstoneDataMailDomain] = Field(
+        ..., title="Mail Domain"
+    )
+
+
+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")
+    includes: TombstoneDataMailAccountIncludes
+
+
+class TombstoneDataCron(CoreApiModel):
+    data_type: Literal["cron"] = Field(..., title="Data Type")
+    node_id: int = Field(..., title="Node Id")
+    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")
+    includes: TombstoneDataCronIncludes
 
 
 class TombstoneDataUNIXUserRabbitMQCredentials(CoreApiModel):
@@ -5328,27 +5625,20 @@ class TombstoneDataUNIXUserRabbitMQCredentials(CoreApiModel):
     rabbitmq_virtual_host_name: constr(
         regex=r"^[a-z0-9-.]+$", min_length=1, max_length=32
     ) = Field(..., title="Rabbitmq Virtual Host Name")
+    includes: TombstoneDataUNIXUserRabbitMQCredentialsIncludes
 
 
 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")
+    includes: TombstoneDataVirtualHostIncludes
 
 
 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")
@@ -5365,6 +5655,14 @@ class TombstoneResource(CoreApiModel):
         TombstoneDataMailAccount,
         TombstoneDataRedisInstance,
         TombstoneDataVirtualHost,
+        TombstoneDataDatabaseUser,
+        TombstoneDataDatabaseUserGrant,
+        TombstoneDataDomainRouter,
+        TombstoneDataHtpasswdFile,
+        TombstoneDataRootSSHKey,
+        TombstoneDataSSHKey,
+        TombstoneDataMailDomain,
+        TombstoneDataMailHostname,
     ] = Field(..., discriminator="data_type", title="Data")
     object_id: int = Field(..., title="Object Id")
     object_model_name: ObjectModelNameEnum
@@ -5372,4 +5670,78 @@ class TombstoneResource(CoreApiModel):
     includes: TombstoneIncludes
 
 
+class NodeDependenciesResource(CoreApiModel):
+    hostname: str = Field(..., title="Hostname")
+    groups: List[NodeGroupDependency] = Field(..., title="Groups")
+    domain_routers: List[NodeDomainRouterDependency] = Field(
+        ..., title="Domain Routers"
+    )
+    daemons: List[NodeDaemonDependency] = Field(..., title="Daemons")
+    crons: List[NodeCronDependency] = Field(..., title="Crons")
+    hosts_entries: List[NodeHostsEntryDependency] = Field(..., title="Hosts Entries")
+
+
+class DaemonLogResource(BaseModel):
+    application_name: constr(min_length=1, max_length=65535) = Field(
+        ..., title="Application Name"
+    )
+    priority: int = Field(..., title="Priority")
+    pid: int = Field(..., title="Pid")
+    message: constr(min_length=1, max_length=65535) = Field(..., title="Message")
+    node_hostname: str = Field(..., title="Node Hostname")
+    timestamp: datetime = Field(..., title="Timestamp")
+
+
+class NodeSpecificationsResource(BaseModel):
+    hostname: str = Field(..., title="Hostname")
+    memory_mib: int = Field(..., title="Memory Mib")
+    cpu_cores: int = Field(..., title="Cpu Cores")
+    disk_gib: int = Field(..., title="Disk Gib")
+    usable_cpu_cores: int = Field(..., title="Usable Cpu Cores")
+    usable_memory_mib: int = Field(..., title="Usable Memory Mib")
+    usable_disk_gib: int = Field(..., title="Usable Disk Gib")
+
+
+class RequestLogIncludes(BaseModel):
+    pass
+
+
+class RequestLogResource(BaseModel):
+    id: int = Field(..., title="Id")
+    created_at: datetime = Field(..., title="Created At")
+    updated_at: datetime = Field(..., title="Updated At")
+    ip_address: str = Field(..., title="Ip Address")
+    path: str = Field(..., title="Path")
+    method: HTTPMethod
+    query_parameters: Dict[str, str] = Field(..., title="Query Parameters")
+    body: Any = Field(
+        ...,
+        description="JSON body if specified and valid on request. Null if no JSON specified, or invalid.",
+        title="Body",
+    )
+    api_user_id: int = Field(..., title="Api User Id")
+    request_id: UUID4 = Field(..., title="Request Id")
+    includes: Optional[RequestLogIncludes] = None
+
+
+class ObjectLogIncludes(BaseModel):
+    customer: Optional[CustomerResource]
+
+
+class ObjectLogResource(BaseModel):
+    id: int = Field(..., title="Id")
+    created_at: datetime = Field(..., title="Created At")
+    updated_at: datetime = Field(..., title="Updated At")
+    object_id: int = Field(..., title="Object Id")
+    object_model_name: Optional[
+        constr(regex=r"^[a-zA-Z]+$", min_length=1, max_length=255)
+    ] = Field(..., title="Object Model Name")
+    request_id: Optional[UUID4] = Field(..., title="Request Id")
+    type: ObjectLogTypeEnum
+    causer_type: Optional[CauserTypeEnum]
+    causer_id: Optional[int] = Field(..., title="Causer Id")
+    customer_id: Optional[int] = Field(..., title="Customer Id")
+    includes: Optional[ObjectLogIncludes] = None
+
+
 NestedPathsDict.update_forward_refs()

{python3_core_api_client-1.0.6 → python3_core_api_client-1.1.0}/src/cyberfusion/CoreApiClient/resources/clusters.py

@@ -2,6 +2,10 @@ from cyberfusion.CoreApiClient import models
 from typing import Optional, List
 
 from cyberfusion.CoreApiClient.interfaces import Resource
+from cyberfusion.CoreApiClient.models import (
+    NodeDependenciesResource,
+    NodeSpecificationsResource,
+)
 
 
 class Clusters(Resource):
@@ -220,3 +224,25 @@ class Clusters(Resource):
                 },
             ).json
         ]
+
+    def list_nodes_dependencies(self, *, id_: int) -> list[NodeDependenciesResource]:
+        return [
+            models.NodeDependenciesResource.parse_obj(model)
+            for model in self.api_connector.send_or_fail(
+                "GET",
+                f"/api/v1/clusters/{id_}/nodes-dependencies",
+                data=None,
+                query_parameters={},
+            ).json
+        ]
+
+    def get_nodes_specifications(self, *, id_: int) -> list[NodeSpecificationsResource]:
+        return [
+            models.NodeSpecificationsResource.parse_obj(model)
+            for model in self.api_connector.send_or_fail(
+                "GET",
+                f"/api/v1/clusters/{id_}/nodes-specifications",
+                data=None,
+                query_parameters={},
+            ).json
+        ]

{python3_core_api_client-1.0.6 → python3_core_api_client-1.1.0}/src/cyberfusion/CoreApiClient/resources/daemons.py

@@ -77,3 +77,25 @@ class Daemons(Resource):
                 "DELETE", f"/api/v1/daemons/{id_}", data=None, query_parameters={}
             ).json
         )
+
+    def list_logs(
+        self,
+        *,
+        daemon_id: int,
+        timestamp: Optional[str] = None,
+        sort: Optional[str] = None,
+        limit: Optional[int] = None,
+    ) -> list[models.DaemonLogResource]:
+        return [
+            models.DaemonLogResource.parse_obj(model)
+            for model in self.api_connector.send_or_fail(
+                "GET",
+                f"/api/v1/daemons/{daemon_id}/logs",
+                data=None,
+                query_parameters={
+                    "timestamp": timestamp,
+                    "sort": sort,
+                    "limit": limit,
+                },
+            ).json
+        ]

{python3_core_api_client-1.0.6 → python3_core_api_client-1.1.0}/src/cyberfusion/CoreApiClient/resources/database_user_grants.py

@@ -64,3 +64,16 @@ class DatabaseUserGrants(Resource):
                 },
             ).json
         ]
+
+    def delete_database_user_grant(
+        self,
+        *,
+        id_: int,
+    ) -> models.DetailMessage:
+        return models.DetailMessage.parse_obj(
+            self.api_connector.send_or_fail(
+                "DELETE",
+                f"/api/v1/database-user-grants/{id_}",
+                data=None,
+            ).json
+        )

python3_core_api_client-1.1.0/src/cyberfusion/CoreApiClient/resources/logs.py

@@ -0,0 +1,96 @@
+from cyberfusion.CoreApiClient import models
+from typing import Optional, List
+
+from cyberfusion.CoreApiClient.interfaces import Resource
+
+
+class Logs(Resource):
+    def list_access_logs(
+        self,
+        *,
+        virtual_host_id: int,
+        timestamp: Optional[str] = None,
+        sort: Optional[str] = None,
+        limit: Optional[int] = None,
+    ) -> list[models.WebServerLogAccessResource]:
+        return [
+            models.WebServerLogAccessResource.parse_obj(model)
+            for model in self.api_connector.send_or_fail(
+                "GET",
+                f"/api/v1/logs/access/{virtual_host_id}",
+                data=None,
+                query_parameters={
+                    "timestamp": timestamp,
+                    "sort": sort,
+                    "limit": limit,
+                },
+            ).json
+        ]
+
+    def list_error_logs(
+        self,
+        *,
+        virtual_host_id: int,
+        timestamp: Optional[str] = None,
+        sort: Optional[str] = None,
+        limit: Optional[int] = None,
+    ) -> list[models.WebServerLogErrorResource]:
+        return [
+            models.WebServerLogErrorResource.parse_obj(model)
+            for model in self.api_connector.send_or_fail(
+                "GET",
+                f"/api/v1/logs/error/{virtual_host_id}",
+                data=None,
+                query_parameters={
+                    "timestamp": timestamp,
+                    "sort": sort,
+                    "limit": limit,
+                },
+            ).json
+        ]
+
+    def list_object_logs(
+        self,
+        *,
+        skip: Optional[int] = None,
+        limit: Optional[int] = None,
+        filter_: Optional[List[str]] = None,
+        sort: Optional[List[str]] = None,
+    ) -> list[models.ObjectLogResource]:
+        return [
+            models.ObjectLogResource.parse_obj(model)
+            for model in self.api_connector.send_or_fail(
+                "GET",
+                "/api/v1/object-logs",
+                data=None,
+                query_parameters={
+                    "skip": skip,
+                    "limit": limit,
+                    "filter": filter_,
+                    "sort": sort,
+                },
+            ).json
+        ]
+
+    def list_request_logs(
+        self,
+        *,
+        skip: Optional[int] = None,
+        limit: Optional[int] = None,
+        filter_: Optional[List[str]] = None,
+        sort: Optional[List[str]] = None,
+    ) -> list[models.RequestLogResource]:
+        return [
+            models.RequestLogResource.parse_obj(model)
+            for model in self.api_connector.send_or_fail(
+                "GET",
+                "/api/v1/request-logs",
+                data=None,
+                query_parameters={
+                    "skip": skip,
+                    "limit": limit,
+                    "filter": filter_,
+                    "sort": sort,
+                },
+            ).json
+        ]

{python3_core_api_client-1.0.6 → python3_core_api_client-1.1.0}/src/cyberfusion/CoreApiClient/resources/passenger_apps.py

@@ -71,13 +71,14 @@ class PassengerApps(Resource):
         self,
         *,
         id_: int,
+        delete_on_cluster: Optional[bool] = None,
     ) -> models.DetailMessage:
         return models.DetailMessage.parse_obj(
             self.api_connector.send_or_fail(
                 "DELETE",
                 f"/api/v1/passenger-apps/{id_}",
                 data=None,
-                query_parameters={},
+                query_parameters={"delete_on_cluster": delete_on_cluster},
             ).json
         )
 

{python3_core_api_client-1.0.6 → python3_core_api_client-1.1.0}/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.6
+Version: 1.1.0
 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.246** version of the API.
+This client was built for and tested on the **1.248** version of the API.
 
 ## Support
 
@@ -250,11 +250,11 @@ To raise `cyberfusion.CoreApiClient.exceptions.CallException` in case of an unex
 
 Auto-generate models as follows:
 
-    datamodel-codegen --input-file-type openapi --input $file --output src/cyberfusion/CoreApiClient/models.py --target-python-version 3.11
+    datamodel-codegen --input-file-type openapi --url http://127.0.0.1:22190/openapi.json --output temp_models.py --target-python-version 3.11
 
-Replace `$file` by the path to the OpenAPI spec (JSON).
+This adds models to `temp_models.py`. Merge it with `models.py`.
 
-Note: don't replace `models.py` in full - it contains customisations.
+To not use a local Core API instance, replace `--url` by `--input`. Pass the path to the OpenAPI spec (JSON).
 
 # Test strategy
 

python3_core_api_client-1.0.6/src/cyberfusion/CoreApiClient/resources/logs.py

@@ -1,50 +0,0 @@
-from cyberfusion.CoreApiClient import models
-from typing import Optional
-
-from cyberfusion.CoreApiClient.interfaces import Resource
-
-
-class Logs(Resource):
-    def list_access_logs(
-        self,
-        *,
-        virtual_host_id: int,
-        timestamp: Optional[str] = None,
-        sort: Optional[models.LogAccessResource] = None,
-        limit: Optional[int] = None,
-    ) -> list[models.LogAccessResource]:
-        return [
-            models.LogAccessResource.parse_obj(model)
-            for model in self.api_connector.send_or_fail(
-                "GET",
-                f"/api/v1/logs/access/{virtual_host_id}",
-                data=None,
-                query_parameters={
-                    "timestamp": timestamp,
-                    "sort": sort,
-                    "limit": limit,
-                },
-            ).json
-        ]
-
-    def list_error_logs(
-        self,
-        *,
-        virtual_host_id: int,
-        timestamp: Optional[str] = None,
-        sort: Optional[models.LogErrorResource] = None,
-        limit: Optional[int] = None,
-    ) -> list[models.LogErrorResource]:
-        return [
-            models.LogErrorResource.parse_obj(model)
-            for model in self.api_connector.send_or_fail(
-                "GET",
-                f"/api/v1/logs/error/{virtual_host_id}",
-                data=None,
-                query_parameters={
-                    "timestamp": timestamp,
-                    "sort": sort,
-                    "limit": limit,
-                },
-            ).json
-        ]