python3-core-api-client 2.6__tar.gz → 2.7__tar.gz

{python3_core_api_client-2.6 → python3_core_api_client-2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-core-api-client
-Version: 2.6
+Version: 2.7
 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.252** version of the API.
+This client was built for and tested on the **1.256** version of the API.
 
 ## Support
 

{python3_core_api_client-2.6 → python3_core_api_client-2.7}/README.md

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

{python3_core_api_client-2.6 → python3_core_api_client-2.7}/pyproject.toml

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

{python3_core_api_client-2.6 → python3_core_api_client-2.7}/src/cyberfusion/CoreApiClient/models.py

@@ -143,7 +143,6 @@ class BorgArchiveMetadata(CoreApiModel):
 
 class BorgRepositoryCreateRequest(CoreApiModel):
     name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=64)
-    passphrase: constr(regex=r"^[ -~]+$", min_length=24, max_length=255)
     unix_user_id: Optional[int]
     keep_hourly: Optional[int]
     keep_daily: Optional[int]
@@ -274,11 +273,11 @@ class CronCreateRequest(CoreApiModel):
     command: constr(regex=r"^[ -~]+$", min_length=1, max_length=65535)
     email_address: Optional[EmailStr]
     schedule: str
-    error_count: int
-    random_delay_max_seconds: int
-    timeout_seconds: Optional[int]
-    locking_enabled: bool
-    is_active: bool
+    error_count: int = 1
+    random_delay_max_seconds: int = 10
+    timeout_seconds: Optional[int] = 600
+    locking_enabled: bool = True
+    is_active: bool = True
     memory_limit: Optional[conint(ge=256)] = None
     cpu_limit: Optional[int] = None
 
@@ -447,12 +446,12 @@ class FPMPoolCreateRequest(CoreApiModel):
     name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=64)
     version: str
     unix_user_id: int
-    max_children: int
-    max_requests: int
-    process_idle_timeout: int
+    max_children: int = 25
+    max_requests: int = 20
+    process_idle_timeout: int = 10
     cpu_limit: Optional[int]
     log_slow_requests_threshold: Optional[int]
-    is_namespaced: bool
+    is_namespaced: bool = True
     memory_limit: Optional[conint(ge=256)] = None
 
 
@@ -470,7 +469,7 @@ class FTPUserCreateRequest(CoreApiModel):
     username: constr(regex=r"^[a-z0-9-_.@]+$", min_length=1, max_length=32)
     unix_user_id: int
     password: constr(regex=r"^[ -~]+$", min_length=24, max_length=255)
-    directory_path: str
+    directory_path: Optional[str] = None
 
 
 class FTPUserUpdateRequest(CoreApiModel):
@@ -540,11 +539,6 @@ class HealthStatusEnum(StrEnum):
     MAINTENANCE = "maintenance"
 
 
-class HostEnum(StrEnum):
-    ALL = "%"
-    LOCALHOST_IPV6 = "::1"
-
-
 class HostsEntryCreateRequest(CoreApiModel):
     node_id: int
     host_name: str
@@ -604,7 +598,7 @@ class MailAccountCreateRequest(CoreApiModel):
     local_part: constr(regex=r"^[a-z0-9-.]+$", min_length=1, max_length=64)
     mail_domain_id: int
     password: constr(regex=r"^[ -~]+$", min_length=6, max_length=255)
-    quota: Optional[int]
+    quota: Optional[int] = None
 
 
 class MailAccountUpdateRequest(CoreApiModel):
@@ -636,8 +630,8 @@ class MailAliasUpdateRequest(CoreApiModel):
 class MailDomainCreateRequest(CoreApiModel):
     domain: str
     unix_user_id: int
-    catch_all_forward_email_addresses: List[EmailStr] = Field(..., unique_items=True)
-    is_local: bool
+    catch_all_forward_email_addresses: List[EmailStr] = Field([], unique_items=True)
+    is_local: bool = True
 
 
 class MailDomainUpdateRequest(CoreApiModel):
@@ -890,8 +884,8 @@ class RedisInstanceCreateRequest(CoreApiModel):
     cluster_id: int
     password: constr(regex=r"^[a-zA-Z0-9]+$", min_length=24, max_length=255)
     memory_limit: conint(ge=8)
-    max_databases: int
-    eviction_policy: RedisEvictionPolicyEnum
+    max_databases: int = 16
+    eviction_policy: RedisEvictionPolicyEnum = RedisEvictionPolicyEnum.VOLATILE_LRU
 
 
 class RedisInstanceUpdateRequest(CoreApiModel):
@@ -938,11 +932,11 @@ class SecurityTXTPolicyCreateRequest(CoreApiModel):
         ...,
         unique_items=True,
     )
-    encryption_key_urls: List[AnyUrl] = Field(..., unique_items=True)
-    acknowledgment_urls: List[AnyUrl] = Field(..., unique_items=True)
-    policy_urls: List[AnyUrl] = Field(..., unique_items=True)
-    opening_urls: List[AnyUrl] = Field(..., unique_items=True)
-    preferred_languages: List[LanguageCodeEnum] = Field(..., unique_items=True)
+    encryption_key_urls: List[AnyUrl] = Field([], unique_items=True)
+    acknowledgment_urls: List[AnyUrl] = Field([], unique_items=True)
+    policy_urls: List[AnyUrl] = Field([], unique_items=True)
+    opening_urls: List[AnyUrl] = Field([], unique_items=True)
+    preferred_languages: List[LanguageCodeEnum] = Field([], unique_items=True)
 
 
 class SecurityTXTPolicyUpdateRequest(CoreApiModel):
@@ -1043,14 +1037,14 @@ class UNIXUserCreateRequest(CoreApiModel):
     mail_domains_directory: Optional[str]
     cluster_id: int
     password: Optional[constr(regex=r"^[ -~]+$", min_length=24, max_length=255)]
-    shell_name: ShellNameEnum
-    record_usage_files: bool
+    shell_name: ShellNameEnum = ShellNameEnum.BASH
+    record_usage_files: bool = False
     default_php_version: Optional[str]
     default_nodejs_version: Optional[constr(regex=r"^[0-9]{1,2}\.[0-9]{1,2}$")]
     description: Optional[
         constr(regex=r"^[a-zA-Z0-9-_ ]+$", min_length=1, max_length=255)
     ]
-    shell_is_namespaced: bool
+    shell_is_namespaced: bool = True
 
 
 class UNIXUserHomeDirectoryEnum(StrEnum):
@@ -1109,9 +1103,9 @@ class URLRedirectCreateRequest(CoreApiModel):
         unique_items=True,
     )
     destination_url: AnyUrl
-    status_code: StatusCodeEnum
-    keep_query_parameters: bool
-    keep_path: bool
+    status_code: StatusCodeEnum = StatusCodeEnum.INTEGER_308
+    keep_query_parameters: bool = True
+    keep_path: bool = True
     description: Optional[
         constr(regex=r"^[a-zA-Z0-9-_ ]+$", min_length=1, max_length=255)
     ]
@@ -1172,7 +1166,6 @@ class BorgArchiveContent(CoreApiModel):
 
 class CMSCreateRequest(CoreApiModel):
     software_name: CMSSoftwareNameEnum
-    is_manually_created: bool
     virtual_host_id: int
 
 
@@ -1187,9 +1180,11 @@ class CertificateManagerCreateRequest(CoreApiModel):
         min_items=1,
         unique_items=True,
     )
-    provider_name: CertificateProviderNameEnum
+    provider_name: CertificateProviderNameEnum = (
+        CertificateProviderNameEnum.LETS_ENCRYPT
+    )
     cluster_id: int
-    request_callback_url: Optional[AnyUrl]
+    request_callback_url: Optional[AnyUrl] = None
 
 
 class ClusterCreateRequest(CoreApiModel):
@@ -1272,7 +1267,7 @@ class CustomConfigSnippetCreateFromContentsRequest(CoreApiModel):
     name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=128)
     server_software_name: VirtualHostServerSoftwareNameEnum
     cluster_id: int
-    is_default: bool
+    is_default: bool = False
     contents: constr(regex=r"^[ -~\n]+$", min_length=1, max_length=65535)
 
 
@@ -1280,7 +1275,7 @@ class CustomConfigSnippetCreateFromTemplateRequest(CoreApiModel):
     name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=128)
     server_software_name: VirtualHostServerSoftwareNameEnum
     cluster_id: int
-    is_default: bool
+    is_default: bool = False
     template_name: CustomConfigSnippetTemplateNameEnum
 
 
@@ -1310,8 +1305,8 @@ class DatabaseCreateRequest(CoreApiModel):
     name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=63)
     server_software_name: DatabaseServerSoftwareNameEnum
     cluster_id: int
-    optimizing_enabled: bool
-    backups_enabled: bool
+    optimizing_enabled: bool = False
+    backups_enabled: bool = True
 
 
 class DatabaseIncludes(CoreApiModel):
@@ -1334,9 +1329,8 @@ class DatabaseUserCreateRequest(CoreApiModel):
     password: constr(regex=r"^[ -~]+$", min_length=24, max_length=255)
     name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=63)
     server_software_name: DatabaseServerSoftwareNameEnum
-    host: Optional[HostEnum]
     cluster_id: int
-    phpmyadmin_firewall_groups_ids: Optional[List[int]]
+    phpmyadmin_firewall_groups_ids: Optional[List[int]] = []
 
 
 class DatabaseUserGrantCreateRequest(CoreApiModel):
@@ -1354,10 +1348,12 @@ class DatabaseUserResource(CoreApiModel):
     id: int
     created_at: datetime
     updated_at: datetime
-    hashed_password: Optional[constr(regex=r"^[ -~]+$", min_length=1, max_length=255)]
+    hashed_password: Optional[
+        constr(regex=r"^[a-zA-Z0-9.\/$=*]+$", min_length=1, max_length=255)
+    ]
     name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=63)
     server_software_name: DatabaseServerSoftwareNameEnum
-    host: Optional[HostEnum]
+    host: Optional[str]
     cluster_id: int
     phpmyadmin_firewall_groups_ids: Optional[List[int]]
     includes: DatabaseUserIncludes
@@ -1511,7 +1507,6 @@ class NodeResource(CoreApiModel):
 
 
 class NodeUpdateRequest(CoreApiModel):
-    groups: Optional[List[NodeGroupEnum]] = None
     comment: Optional[
         constr(regex=r"^[a-zA-Z0-9-_ ]+$", min_length=1, max_length=255)
     ] = None
@@ -1527,11 +1522,11 @@ class PassengerAppCreateNodeJSRequest(CoreApiModel):
     environment: PassengerEnvironmentEnum
     environment_variables: Dict[
         constr(regex=r"^[A-Za-z_]+$"), constr(regex=r"^[ -~]+$")
-    ]
-    max_pool_size: int
-    max_requests: int
-    pool_idle_time: int
-    is_namespaced: bool
+    ] = {}
+    max_pool_size: int = 10
+    max_requests: int = 2000
+    pool_idle_time: int = 10
+    is_namespaced: bool = True
     cpu_limit: Optional[int]
     nodejs_version: constr(regex=r"^[0-9]{1,2}\.[0-9]{1,2}$")
     startup_file: str
@@ -1651,7 +1646,9 @@ class UNIXUserResource(CoreApiModel):
     id: int
     created_at: datetime
     updated_at: datetime
-    hashed_password: Optional[constr(regex=r"^[ -~]+$", min_length=1, max_length=255)]
+    hashed_password: Optional[
+        constr(regex=r"^[a-zA-Z0-9.\/$=*]+$", min_length=1, max_length=255)
+    ]
     username: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=32)
     unix_id: int
     home_directory: str
@@ -1696,19 +1693,23 @@ class URLRedirectResource(CoreApiModel):
 
 class VirtualHostCreateRequest(CoreApiModel):
     server_software_name: Optional[VirtualHostServerSoftwareNameEnum]
-    allow_override_directives: Optional[List[AllowOverrideDirectiveEnum]]
-    allow_override_option_directives: Optional[List[AllowOverrideOptionDirectiveEnum]]
+    allow_override_directives: Optional[List[AllowOverrideDirectiveEnum]] = None
+    allow_override_option_directives: Optional[
+        List[AllowOverrideOptionDirectiveEnum]
+    ] = None
     domain: str
     public_root: str
     unix_user_id: int
     server_aliases: List[str] = Field(
-        ...,
+        [],
         unique_items=True,
     )
     document_root: str
-    fpm_pool_id: Optional[int]
-    passenger_app_id: Optional[int]
-    custom_config: Optional[constr(regex=r"^[ -~\n]+$", min_length=1, max_length=65535)]
+    fpm_pool_id: Optional[int] = None
+    passenger_app_id: Optional[int] = None
+    custom_config: Optional[
+        constr(regex=r"^[ -~\n]+$", min_length=1, max_length=65535)
+    ] = None
 
 
 class BorgRepositoryIncludes(CoreApiModel):
@@ -1863,7 +1864,7 @@ class FTPUserResource(CoreApiModel):
     id: int
     created_at: datetime
     updated_at: datetime
-    hashed_password: constr(regex=r"^[ -~]+$", min_length=1, max_length=255)
+    hashed_password: constr(regex=r"^[a-zA-Z0-9.\/$=*]+$", min_length=1, max_length=255)
     cluster_id: int
     username: constr(regex=r"^[a-z0-9-_.@]+$", min_length=1, max_length=32)
     unix_user_id: int
@@ -1946,7 +1947,7 @@ class HtpasswdUserResource(CoreApiModel):
     id: int
     created_at: datetime
     updated_at: datetime
-    hashed_password: constr(regex=r"^[ -~]+$", min_length=1, max_length=255)
+    hashed_password: constr(regex=r"^[a-zA-Z0-9.\/$=*]+$", min_length=1, max_length=255)
     cluster_id: int
     username: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=255)
     htpasswd_file_id: int
@@ -2234,7 +2235,7 @@ class MailAccountResource(CoreApiModel):
     id: int
     created_at: datetime
     updated_at: datetime
-    hashed_password: constr(regex=r"^[ -~]+$", min_length=1, max_length=255)
+    hashed_password: constr(regex=r"^[a-zA-Z0-9.\/$=*]+$", min_length=1, max_length=255)
     local_part: constr(regex=r"^[a-z0-9-.]+$", min_length=1, max_length=64)
     mail_domain_id: int
     cluster_id: int
@@ -2329,7 +2330,7 @@ class TombstoneDataDatabaseUser(CoreApiModel):
     id: int
     data_type: Literal["database_user"]
     name: constr(regex=r"^[a-z0-9-_]+$", min_length=1, max_length=63)
-    host: Optional[HostEnum]
+    host: Optional[str]
     server_software_name: DatabaseServerSoftwareNameEnum
     includes: TombstoneDataDatabaseUserIncludes
 
@@ -2775,7 +2776,7 @@ class ClusterLoadBalancingPropertiesIncludes(CoreApiModel):
 
 
 class ClusterMariadbPropertiesCreateRequest(CoreApiModel):
-    mariadb_version: str
+    mariadb_version: str = "11.4"
     mariadb_backup_interval: conint(ge=1, le=24) = 24
     mariadb_backup_local_retention: conint(ge=1, le=24) = 3
 
@@ -2920,7 +2921,7 @@ class ClusterPhpPropertiesIncludes(CoreApiModel):
 
 
 class ClusterPostgresqlPropertiesCreateRequest(CoreApiModel):
-    postgresql_version: int
+    postgresql_version: int = 15
     postgresql_backup_local_retention: conint(ge=1, le=24) = 3
     postgresql_backup_interval: conint(ge=1, le=24) = 24
 
@@ -3097,7 +3098,7 @@ class ClusterPhpPropertiesCreateRequest(CoreApiModel):
         unique_items=True,
     )
     custom_php_modules_names: List[PHPExtensionEnum] = Field(
-        ...,
+        [],
         unique_items=True,
     )
     php_settings: PHPSettings

{python3_core_api_client-2.6 → python3_core_api_client-2.7}/src/cyberfusion/CoreApiClient/resources/clusters.py

@@ -210,14 +210,14 @@ class Clusters(Resource):
     def list_unix_users_home_directory_usages(
         self,
         *,
-        cluster_id: int,
+        id_: int,
         timestamp: str,
         time_unit: Optional[models.UNIXUsersHomeDirectoryUsageResource] = None,
         includes: list[str] | None = None,
     ) -> DtoResponse[list[models.UNIXUsersHomeDirectoryUsageResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
-            f"/api/v1/clusters/unix-users-home-directories/usages/{cluster_id}",
+            f"/api/v1/clusters/{id_}/usages/unix-users-home-directory",
             data=None,
             query_parameters={
                 "timestamp": timestamp,
@@ -287,10 +287,7 @@ class Clusters(Resource):
         )
 
     def read_borg_properties(
-        self,
-        *,
-        id_: int,
-        includes: list[str] | None = None
+        self, *, id_: int, includes: list[str] | None = None
     ) -> DtoResponse[models.ClusterBorgPropertiesResource]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -304,10 +301,7 @@ class Clusters(Resource):
         )
 
     def read_elasticsearch_properties(
-        self,
-        *,
-        id_: int,
-        includes: list[str] | None = None
+        self, *, id_: int, includes: list[str] | None = None
     ) -> DtoResponse[models.ClusterElasticsearchPropertiesResource]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -321,10 +315,7 @@ class Clusters(Resource):
         )
 
     def read_firewall_properties(
-        self,
-        *,
-        id_: int,
-        includes: list[str] | None = None
+        self, *, id_: int, includes: list[str] | None = None
     ) -> DtoResponse[models.ClusterFirewallPropertiesResource]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -338,10 +329,7 @@ class Clusters(Resource):
         )
 
     def read_grafana_properties(
-        self,
-        *,
-        id_: int,
-        includes: list[str] | None = None
+        self, *, id_: int, includes: list[str] | None = None
     ) -> DtoResponse[models.ClusterGrafanaPropertiesResource]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -355,10 +343,7 @@ class Clusters(Resource):
         )
 
     def read_kernelcare_properties(
-        self,
-        *,
-        id_: int,
-        includes: list[str] | None = None
+        self, *, id_: int, includes: list[str] | None = None
     ) -> DtoResponse[models.ClusterKernelcarePropertiesResource]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -372,10 +357,7 @@ class Clusters(Resource):
         )
 
     def read_load_balancing_properties(
-        self,
-        *,
-        id_: int,
-        includes: list[str] | None = None
+        self, *, id_: int, includes: list[str] | None = None
     ) -> DtoResponse[models.ClusterLoadBalancingPropertiesResource]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -389,10 +371,7 @@ class Clusters(Resource):
         )
 
     def read_mariadb_properties(
-        self,
-        *,
-        id_: int,
-        includes: list[str] | None = None
+        self, *, id_: int, includes: list[str] | None = None
     ) -> DtoResponse[models.ClusterMariadbPropertiesResource]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -406,10 +385,7 @@ class Clusters(Resource):
         )
 
     def read_meilisearch_properties(
-        self,
-        *,
-        id_: int,
-        includes: list[str] | None = None
+        self, *, id_: int, includes: list[str] | None = None
     ) -> DtoResponse[models.ClusterMeilisearchPropertiesResource]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -423,10 +399,7 @@ class Clusters(Resource):
         )
 
     def read_metabase_properties(
-        self,
-        *,
-        id_: int,
-        includes: list[str] | None = None
+        self, *, id_: int, includes: list[str] | None = None
     ) -> DtoResponse[models.ClusterMetabasePropertiesResource]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -440,10 +413,7 @@ class Clusters(Resource):
         )
 
     def read_new_relic_properties(
-        self,
-        *,
-        id_: int,
-        includes: list[str] | None = None
+        self, *, id_: int, includes: list[str] | None = None
     ) -> DtoResponse[models.ClusterNewRelicPropertiesResource]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -457,10 +427,7 @@ class Clusters(Resource):
         )
 
     def read_nodejs_properties(
-        self,
-        *,
-        id_: int,
-        includes: list[str] | None = None
+        self, *, id_: int, includes: list[str] | None = None
     ) -> DtoResponse[models.ClusterNodejsPropertiesResource]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -474,10 +441,7 @@ class Clusters(Resource):
         )
 
     def read_os_properties(
-        self,
-        *,
-        id_: int,
-        includes: list[str] | None = None
+        self, *, id_: int, includes: list[str] | None = None
     ) -> DtoResponse[models.ClusterOsPropertiesResource]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -491,10 +455,7 @@ class Clusters(Resource):
         )
 
     def read_php_properties(
-        self,
-        *,
-        id_: int,
-        includes: list[str] | None = None
+        self, *, id_: int, includes: list[str] | None = None
     ) -> DtoResponse[models.ClusterPhpPropertiesResource]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -508,10 +469,7 @@ class Clusters(Resource):
         )
 
     def read_postgresql_properties(
-        self,
-        *,
-        id_: int,
-        includes: list[str] | None = None
+        self, *, id_: int, includes: list[str] | None = None
     ) -> DtoResponse[models.ClusterPostgresqlPropertiesResource]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -525,10 +483,7 @@ class Clusters(Resource):
         )
 
     def read_rabbitmq_properties(
-        self,
-        *,
-        id_: int,
-        includes: list[str] | None = None
+        self, *, id_: int, includes: list[str] | None = None
     ) -> DtoResponse[models.ClusterRabbitmqPropertiesResource]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -542,10 +497,7 @@ class Clusters(Resource):
         )
 
     def read_redis_properties(
-        self,
-        *,
-        id_: int,
-        includes: list[str] | None = None
+        self, *, id_: int, includes: list[str] | None = None
     ) -> DtoResponse[models.ClusterRedisPropertiesResource]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -559,10 +511,7 @@ class Clusters(Resource):
         )
 
     def read_singlestore_properties(
-        self,
-        *,
-        id_: int,
-        includes: list[str] | None = None
+        self, *, id_: int, includes: list[str] | None = None
     ) -> DtoResponse[models.ClusterSinglestorePropertiesResource]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -576,10 +525,7 @@ class Clusters(Resource):
         )
 
     def read_unix_users_properties(
-        self,
-        *,
-        id_: int,
-        includes: list[str] | None = None
+        self, *, id_: int, includes: list[str] | None = None
     ) -> DtoResponse[models.ClusterUnixUsersPropertiesResource]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -870,7 +816,7 @@ class Clusters(Resource):
         page: int = 1,
         per_page: int = 0,
         include_filters: models.ClustersBorgPropertiesSearchRequest | None = None,
-        includes: list[str] | None = None
+        includes: list[str] | None = None,
     ) -> DtoResponse[list[models.ClusterBorgPropertiesResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -894,7 +840,7 @@ class Clusters(Resource):
         page: int = 1,
         per_page: int = 0,
         include_filters: models.ClustersRedisPropertiesSearchRequest | None = None,
-        includes: list[str] | None = None
+        includes: list[str] | None = None,
     ) -> DtoResponse[list[models.ClusterRedisPropertiesResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -919,7 +865,7 @@ class Clusters(Resource):
         per_page: int = 0,
         include_filters: models.ClustersElasticsearchPropertiesSearchRequest
         | None = None,
-        includes: list[str] | None = None
+        includes: list[str] | None = None,
     ) -> DtoResponse[list[models.ClusterElasticsearchPropertiesResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -943,7 +889,7 @@ class Clusters(Resource):
         page: int = 1,
         per_page: int = 0,
         include_filters: models.ClustersFirewallPropertiesSearchRequest | None = None,
-        includes: list[str] | None = None
+        includes: list[str] | None = None,
     ) -> DtoResponse[list[models.ClusterFirewallPropertiesResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -967,7 +913,7 @@ class Clusters(Resource):
         page: int = 1,
         per_page: int = 0,
         include_filters: models.ClustersGrafanaPropertiesSearchRequest | None = None,
-        includes: list[str] | None = None
+        includes: list[str] | None = None,
     ) -> DtoResponse[list[models.ClusterGrafanaPropertiesResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -991,7 +937,7 @@ class Clusters(Resource):
         page: int = 1,
         per_page: int = 0,
         include_filters: models.ClustersKernelcarePropertiesSearchRequest | None = None,
-        includes: list[str] | None = None
+        includes: list[str] | None = None,
     ) -> DtoResponse[list[models.ClusterKernelcarePropertiesResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -1016,7 +962,7 @@ class Clusters(Resource):
         per_page: int = 0,
         include_filters: models.ClustersLoadBalancingPropertiesSearchRequest
         | None = None,
-        includes: list[str] | None = None
+        includes: list[str] | None = None,
     ) -> DtoResponse[list[models.ClusterLoadBalancingPropertiesResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -1040,7 +986,7 @@ class Clusters(Resource):
         page: int = 1,
         per_page: int = 0,
         include_filters: models.ClustersMariadbPropertiesSearchRequest | None = None,
-        includes: list[str] | None = None
+        includes: list[str] | None = None,
     ) -> DtoResponse[list[models.ClusterMariadbPropertiesResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -1065,7 +1011,7 @@ class Clusters(Resource):
         per_page: int = 0,
         include_filters: models.ClustersMeilisearchPropertiesSearchRequest
         | None = None,
-        includes: list[str] | None = None
+        includes: list[str] | None = None,
     ) -> DtoResponse[list[models.ClusterMeilisearchPropertiesResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -1089,7 +1035,7 @@ class Clusters(Resource):
         page: int = 1,
         per_page: int = 0,
         include_filters: models.ClustersMetabasePropertiesSearchRequest | None = None,
-        includes: list[str] | None = None
+        includes: list[str] | None = None,
     ) -> DtoResponse[list[models.ClusterMetabasePropertiesResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -1113,7 +1059,7 @@ class Clusters(Resource):
         page: int = 1,
         per_page: int = 0,
         include_filters: models.ClustersNewRelicPropertiesSearchRequest | None = None,
-        includes: list[str] | None = None
+        includes: list[str] | None = None,
     ) -> DtoResponse[list[models.ClusterNewRelicPropertiesResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -1137,7 +1083,7 @@ class Clusters(Resource):
         page: int = 1,
         per_page: int = 0,
         include_filters: models.ClustersNodejsPropertiesSearchRequest | None = None,
-        includes: list[str] | None = None
+        includes: list[str] | None = None,
     ) -> DtoResponse[list[models.ClusterNodejsPropertiesResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -1161,7 +1107,7 @@ class Clusters(Resource):
         page: int = 1,
         per_page: int = 0,
         include_filters: models.ClustersOsPropertiesSearchRequest | None = None,
-        includes: list[str] | None = None
+        includes: list[str] | None = None,
     ) -> DtoResponse[list[models.ClusterOsPropertiesResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -1185,7 +1131,7 @@ class Clusters(Resource):
         page: int = 1,
         per_page: int = 0,
         include_filters: models.ClustersPhpPropertiesSearchRequest | None = None,
-        includes: list[str] | None = None
+        includes: list[str] | None = None,
     ) -> DtoResponse[list[models.ClusterPhpPropertiesResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -1209,7 +1155,7 @@ class Clusters(Resource):
         page: int = 1,
         per_page: int = 0,
         include_filters: models.ClustersPostgresqlPropertiesSearchRequest | None = None,
-        includes: list[str] | None = None
+        includes: list[str] | None = None,
     ) -> DtoResponse[list[models.ClusterPostgresqlPropertiesResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -1233,7 +1179,7 @@ class Clusters(Resource):
         page: int = 1,
         per_page: int = 0,
         include_filters: models.ClustersRabbitmqPropertiesSearchRequest | None = None,
-        includes: list[str] | None = None
+        includes: list[str] | None = None,
     ) -> DtoResponse[list[models.ClusterRabbitmqPropertiesResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -1258,7 +1204,7 @@ class Clusters(Resource):
         per_page: int = 0,
         include_filters: models.ClustersSinglestorePropertiesSearchRequest
         | None = None,
-        includes: list[str] | None = None
+        includes: list[str] | None = None,
     ) -> DtoResponse[list[models.ClusterSinglestorePropertiesResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -1282,7 +1228,7 @@ class Clusters(Resource):
         page: int = 1,
         per_page: int = 0,
         include_filters: models.ClustersUnixUsersPropertiesSearchRequest | None = None,
-        includes: list[str] | None = None
+        includes: list[str] | None = None,
     ) -> DtoResponse[list[models.ClusterUnixUsersPropertiesResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",

{python3_core_api_client-2.6 → python3_core_api_client-2.7}/src/cyberfusion/CoreApiClient/resources/databases.py

@@ -130,14 +130,14 @@ class Databases(Resource):
     def list_database_usages(
         self,
         *,
-        database_id: int,
+        id_: int,
         timestamp: str,
         time_unit: Optional[models.DatabaseUsageResource] = None,
         includes: list[str] | None = None,
     ) -> DtoResponse[list[models.DatabaseUsageResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
-            f"/api/v1/databases/usages/{database_id}",
+            f"/api/v1/databases/{id_}/usages",
             data=None,
             query_parameters={
                 "timestamp": timestamp,

{python3_core_api_client-2.6 → python3_core_api_client-2.7}/src/cyberfusion/CoreApiClient/resources/logs.py

@@ -1,5 +1,4 @@
 from cyberfusion.CoreApiClient import models
-from typing import Optional
 
 from cyberfusion.CoreApiClient._helpers import construct_includes_query_parameter
 from cyberfusion.CoreApiClient.http import DtoResponse
@@ -7,50 +6,6 @@ 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,
-        page: int = 1,
-    ) -> DtoResponse[list[models.WebServerLogAccessResource]]:
-        local_response = self.api_connector.send_or_fail(
-            "GET",
-            f"/api/v1/logs/access/{virtual_host_id}",
-            data=None,
-            query_parameters={
-                "timestamp": timestamp,
-                "page": page,
-            },
-        )
-
-        return DtoResponse.from_response(
-            local_response, models.WebServerLogAccessResource
-        )
-
-    def list_error_logs(
-        self,
-        *,
-        virtual_host_id: int,
-        timestamp: Optional[str] = None,
-        sort: Optional[str] = None,
-        page: int = 1,
-    ) -> DtoResponse[list[models.WebServerLogErrorResource]]:
-        local_response = self.api_connector.send_or_fail(
-            "GET",
-            f"/api/v1/logs/error/{virtual_host_id}",
-            data=None,
-            query_parameters={
-                "timestamp": timestamp,
-                "page": page,
-            },
-        )
-
-        return DtoResponse.from_response(
-            local_response, models.WebServerLogErrorResource
-        )
-
     def list_object_logs(
         self,
         *,

{python3_core_api_client-2.6 → python3_core_api_client-2.7}/src/cyberfusion/CoreApiClient/resources/mail_accounts.py

@@ -92,14 +92,14 @@ class MailAccounts(Resource):
     def list_mail_account_usages(
         self,
         *,
-        mail_account_id: int,
+        id_: int,
         timestamp: str,
         time_unit: Optional[models.MailAccountUsageResource] = None,
         includes: list[str] | None = None,
     ) -> DtoResponse[list[models.MailAccountUsageResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
-            f"/api/v1/mail-accounts/usages/{mail_account_id}",
+            f"/api/v1/mail-accounts/{id_}/usages",
             data=None,
             query_parameters={
                 "timestamp": timestamp,

{python3_core_api_client-2.6 → python3_core_api_client-2.7}/src/cyberfusion/CoreApiClient/resources/nodes.py

@@ -4,6 +4,7 @@ from typing import Optional
 from cyberfusion.CoreApiClient.interfaces import Resource
 from cyberfusion.CoreApiClient._helpers import construct_includes_query_parameter
 from cyberfusion.CoreApiClient.http import DtoResponse
+from cyberfusion.CoreApiClient.models import NodeGroupEnum
 
 
 class Nodes(Resource):
@@ -119,3 +120,21 @@ class Nodes(Resource):
         )
 
         return DtoResponse.from_response(local_response, models.TaskCollectionResource)
+
+    def add_node_groups(
+        self,
+        *,
+        id_: int,
+        groups: list[NodeGroupEnum],
+        callback_url: Optional[str] = None,
+    ) -> DtoResponse[models.TaskCollectionResource]:
+        local_response = self.api_connector.send_or_fail(
+            "POST",
+            f"/api/v1/nodes/{id_}/groups",
+            data=groups,
+            query_parameters={
+                "callback_url": callback_url,
+            },
+        )
+
+        return DtoResponse.from_response(local_response, models.TaskCollectionResource)

{python3_core_api_client-2.6 → python3_core_api_client-2.7}/src/cyberfusion/CoreApiClient/resources/unix_users.py

@@ -109,14 +109,14 @@ class UNIXUsers(Resource):
     def list_unix_user_usages(
         self,
         *,
-        unix_user_id: int,
+        id_: int,
         timestamp: str,
         time_unit: Optional[models.UNIXUserUsageResource] = None,
         includes: list[str] | None = None,
     ) -> DtoResponse[list[models.UNIXUserUsageResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
-            f"/api/v1/unix-users/usages/{unix_user_id}",
+            f"/api/v1/unix-users/{id_}/usages",
             data=None,
             query_parameters={
                 "timestamp": timestamp,

{python3_core_api_client-2.6 → python3_core_api_client-2.7}/src/cyberfusion/CoreApiClient/resources/virtual_hosts.py

@@ -123,3 +123,47 @@ class VirtualHosts(Resource):
         )
 
         return DtoResponse.from_response(local_response, models.TaskCollectionResource)
+
+    def list_access_logs(
+        self,
+        *,
+        id_: int,
+        timestamp: Optional[str] = None,
+        sort: Optional[str] = None,
+        page: int = 1,
+    ) -> DtoResponse[list[models.WebServerLogAccessResource]]:
+        local_response = self.api_connector.send_or_fail(
+            "GET",
+            f"/api/v1/virtual-hosts/{id_}/logs/access",
+            data=None,
+            query_parameters={
+                "timestamp": timestamp,
+                "page": page,
+            },
+        )
+
+        return DtoResponse.from_response(
+            local_response, models.WebServerLogAccessResource
+        )
+
+    def list_error_logs(
+        self,
+        *,
+        id_: int,
+        timestamp: Optional[str] = None,
+        sort: Optional[str] = None,
+        page: int = 1,
+    ) -> DtoResponse[list[models.WebServerLogErrorResource]]:
+        local_response = self.api_connector.send_or_fail(
+            "GET",
+            f"/api/v1/virtual-hosts/{id_}/logs/error",
+            data=None,
+            query_parameters={
+                "timestamp": timestamp,
+                "page": page,
+            },
+        )
+
+        return DtoResponse.from_response(
+            local_response, models.WebServerLogErrorResource
+        )

{python3_core_api_client-2.6 → python3_core_api_client-2.7}/src/python3_core_api_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-core-api-client
-Version: 2.6
+Version: 2.7
 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.252** version of the API.
+This client was built for and tested on the **1.256** version of the API.
 
 ## Support