python3-core-api-client 2.3__py3-none-any.whl → 2.4.1__py3-none-any.whl

cyberfusion/CoreApiClient/resources/haproxy_listens.py

@@ -1,5 +1,4 @@
 from cyberfusion.CoreApiClient import models
-from typing import Optional, List
 
 from cyberfusion.CoreApiClient.interfaces import Resource
 from cyberfusion.CoreApiClient.http import DtoResponse
@@ -22,21 +21,21 @@ class HAProxyListens(Resource):
     def list_haproxy_listens(
         self,
         *,
-        skip: Optional[int] = None,
-        limit: Optional[int] = None,
-        filter_: Optional[List[str]] = None,
-        sort: Optional[List[str]] = None,
+        page: int = 1,
+        per_page: int = 0,
+        include_filters: models.HaproxyListensSearchRequest | None = None,
     ) -> DtoResponse[list[models.HAProxyListenResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
             "/api/v1/haproxy-listens",
             data=None,
             query_parameters={
-                "skip": skip,
-                "limit": limit,
-                "filter": filter_,
-                "sort": sort,
-            },
+                "page": page,
+                "per_page": per_page,
+            }
+            | include_filters.dict(exclude_unset=True)
+            if include_filters
+            else None,
         )
 
         return DtoResponse.from_response(local_response, models.HAProxyListenResource)

cyberfusion/CoreApiClient/resources/haproxy_listens_to_nodes.py

@@ -1,5 +1,4 @@
 from cyberfusion.CoreApiClient import models
-from typing import Optional, List
 
 from cyberfusion.CoreApiClient.interfaces import Resource
 from cyberfusion.CoreApiClient.http import DtoResponse
@@ -24,21 +23,21 @@ class HAProxyListensToNodes(Resource):
     def list_haproxy_listens_to_nodes(
         self,
         *,
-        skip: Optional[int] = None,
-        limit: Optional[int] = None,
-        filter_: Optional[List[str]] = None,
-        sort: Optional[List[str]] = None,
+        page: int = 1,
+        per_page: int = 0,
+        include_filters: models.HaproxyListensToNodesSearchRequest | None = None,
     ) -> DtoResponse[list[models.HAProxyListenToNodeResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
             "/api/v1/haproxy-listens-to-nodes",
             data=None,
             query_parameters={
-                "skip": skip,
-                "limit": limit,
-                "filter": filter_,
-                "sort": sort,
-            },
+                "page": page,
+                "per_page": per_page,
+            }
+            | include_filters.dict(exclude_unset=True)
+            if include_filters
+            else None,
         )
 
         return DtoResponse.from_response(

cyberfusion/CoreApiClient/resources/hosts_entries.py

@@ -1,5 +1,4 @@
 from cyberfusion.CoreApiClient import models
-from typing import Optional, List
 from cyberfusion.CoreApiClient.interfaces import Resource
 from cyberfusion.CoreApiClient.http import DtoResponse
 
@@ -21,21 +20,21 @@ class HostsEntries(Resource):
     def list_hosts_entries(
         self,
         *,
-        skip: Optional[int] = None,
-        limit: Optional[int] = None,
-        filter_: Optional[List[str]] = None,
-        sort: Optional[List[str]] = None,
+        page: int = 1,
+        per_page: int = 0,
+        include_filters: models.HostsEntriesSearchRequest | None = None,
     ) -> DtoResponse[list[models.HostsEntryResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
             "/api/v1/hosts-entries",
             data=None,
             query_parameters={
-                "skip": skip,
-                "limit": limit,
-                "filter": filter_,
-                "sort": sort,
-            },
+                "page": page,
+                "per_page": per_page,
+            }
+            | include_filters.dict(exclude_unset=True)
+            if include_filters
+            else None,
         )
 
         return DtoResponse.from_response(local_response, models.HostsEntryResource)

cyberfusion/CoreApiClient/resources/htpasswd_files.py

@@ -1,5 +1,4 @@
 from cyberfusion.CoreApiClient import models
-from typing import Optional, List
 
 from cyberfusion.CoreApiClient.interfaces import Resource
 from cyberfusion.CoreApiClient.http import DtoResponse
@@ -22,21 +21,21 @@ class HtpasswdFiles(Resource):
     def list_htpasswd_files(
         self,
         *,
-        skip: Optional[int] = None,
-        limit: Optional[int] = None,
-        filter_: Optional[List[str]] = None,
-        sort: Optional[List[str]] = None,
+        page: int = 1,
+        per_page: int = 0,
+        include_filters: models.HtpasswdFilesSearchRequest | None = None,
     ) -> DtoResponse[list[models.HtpasswdFileResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
             "/api/v1/htpasswd-files",
             data=None,
             query_parameters={
-                "skip": skip,
-                "limit": limit,
-                "filter": filter_,
-                "sort": sort,
-            },
+                "page": page,
+                "per_page": per_page,
+            }
+            | include_filters.dict(exclude_unset=True)
+            if include_filters
+            else None,
         )
 
         return DtoResponse.from_response(local_response, models.HtpasswdFileResource)

cyberfusion/CoreApiClient/resources/htpasswd_users.py

@@ -1,5 +1,4 @@
 from cyberfusion.CoreApiClient import models
-from typing import Optional, List
 
 from cyberfusion.CoreApiClient.interfaces import Resource
 from cyberfusion.CoreApiClient.http import DtoResponse
@@ -22,21 +21,21 @@ class HtpasswdUsers(Resource):
     def list_htpasswd_users(
         self,
         *,
-        skip: Optional[int] = None,
-        limit: Optional[int] = None,
-        filter_: Optional[List[str]] = None,
-        sort: Optional[List[str]] = None,
+        page: int = 1,
+        per_page: int = 0,
+        include_filters: models.HtpasswdUsersSearchRequest | None = None,
     ) -> DtoResponse[list[models.HtpasswdUserResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
             "/api/v1/htpasswd-users",
             data=None,
             query_parameters={
-                "skip": skip,
-                "limit": limit,
-                "filter": filter_,
-                "sort": sort,
-            },
+                "page": page,
+                "per_page": per_page,
+            }
+            | include_filters.dict(exclude_unset=True)
+            if include_filters
+            else None,
         )
 
         return DtoResponse.from_response(local_response, models.HtpasswdUserResource)

cyberfusion/CoreApiClient/resources/logs.py

@@ -1,5 +1,5 @@
 from cyberfusion.CoreApiClient import models
-from typing import Optional, List
+from typing import Optional
 
 from cyberfusion.CoreApiClient.http import DtoResponse
 from cyberfusion.CoreApiClient.interfaces import Resource
@@ -12,7 +12,7 @@ class Logs(Resource):
         virtual_host_id: int,
         timestamp: Optional[str] = None,
         sort: Optional[str] = None,
-        limit: Optional[int] = None,
+        page: int = 1,
     ) -> DtoResponse[list[models.WebServerLogAccessResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -20,8 +20,7 @@ class Logs(Resource):
             data=None,
             query_parameters={
                 "timestamp": timestamp,
-                "sort": sort,
-                "limit": limit,
+                "page": page,
             },
         )
 
@@ -35,7 +34,7 @@ class Logs(Resource):
         virtual_host_id: int,
         timestamp: Optional[str] = None,
         sort: Optional[str] = None,
-        limit: Optional[int] = None,
+        page: int = 1,
     ) -> DtoResponse[list[models.WebServerLogErrorResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
@@ -43,8 +42,7 @@ class Logs(Resource):
             data=None,
             query_parameters={
                 "timestamp": timestamp,
-                "sort": sort,
-                "limit": limit,
+                "page": page,
             },
         )
 
@@ -55,21 +53,21 @@ class Logs(Resource):
     def list_object_logs(
         self,
         *,
-        skip: Optional[int] = None,
-        limit: Optional[int] = None,
-        filter_: Optional[List[str]] = None,
-        sort: Optional[List[str]] = None,
+        page: int = 1,
+        per_page: int = 0,
+        include_filters: models.ObjectLogsSearchRequest | None = None,
     ) -> DtoResponse[list[models.ObjectLogResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
             "/api/v1/object-logs",
             data=None,
             query_parameters={
-                "skip": skip,
-                "limit": limit,
-                "filter": filter_,
-                "sort": sort,
-            },
+                "page": page,
+                "per_page": per_page,
+            }
+            | include_filters.dict(exclude_unset=True)
+            if include_filters
+            else None,
         )
 
         return DtoResponse.from_response(local_response, models.ObjectLogResource)
@@ -77,21 +75,21 @@ class Logs(Resource):
     def list_request_logs(
         self,
         *,
-        skip: Optional[int] = None,
-        limit: Optional[int] = None,
-        filter_: Optional[List[str]] = None,
-        sort: Optional[List[str]] = None,
+        page: int = 1,
+        per_page: int = 0,
+        include_filters: models.RequestLogsSearchRequest | None = None,
     ) -> DtoResponse[list[models.RequestLogResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
             "/api/v1/request-logs",
             data=None,
             query_parameters={
-                "skip": skip,
-                "limit": limit,
-                "filter": filter_,
-                "sort": sort,
-            },
+                "page": page,
+                "per_page": per_page,
+            }
+            | include_filters.dict(exclude_unset=True)
+            if include_filters
+            else None,
         )
 
         return DtoResponse.from_response(local_response, models.RequestLogResource)

cyberfusion/CoreApiClient/resources/mail_accounts.py

@@ -1,5 +1,5 @@
 from cyberfusion.CoreApiClient import models
-from typing import Optional, List
+from typing import Optional
 
 from cyberfusion.CoreApiClient.interfaces import Resource
 from cyberfusion.CoreApiClient.http import DtoResponse
@@ -22,21 +22,21 @@ class MailAccounts(Resource):
     def list_mail_accounts(
         self,
         *,
-        skip: Optional[int] = None,
-        limit: Optional[int] = None,
-        filter_: Optional[List[str]] = None,
-        sort: Optional[List[str]] = None,
+        page: int = 1,
+        per_page: int = 0,
+        include_filters: models.MailAccountsSearchRequest | None = None,
     ) -> DtoResponse[list[models.MailAccountResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
             "/api/v1/mail-accounts",
             data=None,
             query_parameters={
-                "skip": skip,
-                "limit": limit,
-                "filter": filter_,
-                "sort": sort,
-            },
+                "page": page,
+                "per_page": per_page,
+            }
+            | include_filters.dict(exclude_unset=True)
+            if include_filters
+            else None,
         )
 
         return DtoResponse.from_response(local_response, models.MailAccountResource)

cyberfusion/CoreApiClient/resources/mail_aliases.py

@@ -1,5 +1,4 @@
 from cyberfusion.CoreApiClient import models
-from typing import Optional, List
 
 from cyberfusion.CoreApiClient.interfaces import Resource
 from cyberfusion.CoreApiClient.http import DtoResponse
@@ -22,21 +21,21 @@ class MailAliases(Resource):
     def list_mail_aliases(
         self,
         *,
-        skip: Optional[int] = None,
-        limit: Optional[int] = None,
-        filter_: Optional[List[str]] = None,
-        sort: Optional[List[str]] = None,
+        page: int = 1,
+        per_page: int = 0,
+        include_filters: models.MailAliasesSearchRequest | None = None,
     ) -> DtoResponse[list[models.MailAliasResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
             "/api/v1/mail-aliases",
             data=None,
             query_parameters={
-                "skip": skip,
-                "limit": limit,
-                "filter": filter_,
-                "sort": sort,
-            },
+                "page": page,
+                "per_page": per_page,
+            }
+            | include_filters.dict(exclude_unset=True)
+            if include_filters
+            else None,
         )
 
         return DtoResponse.from_response(local_response, models.MailAliasResource)

cyberfusion/CoreApiClient/resources/mail_domains.py

@@ -1,5 +1,4 @@
 from cyberfusion.CoreApiClient import models
-from typing import Optional, List
 
 from cyberfusion.CoreApiClient.interfaces import Resource
 from cyberfusion.CoreApiClient.http import DtoResponse
@@ -22,21 +21,21 @@ class MailDomains(Resource):
     def list_mail_domains(
         self,
         *,
-        skip: Optional[int] = None,
-        limit: Optional[int] = None,
-        filter_: Optional[List[str]] = None,
-        sort: Optional[List[str]] = None,
+        page: int = 1,
+        per_page: int = 0,
+        include_filters: models.MailDomainsSearchRequest | None = None,
     ) -> DtoResponse[list[models.MailDomainResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
             "/api/v1/mail-domains",
             data=None,
             query_parameters={
-                "skip": skip,
-                "limit": limit,
-                "filter": filter_,
-                "sort": sort,
-            },
+                "page": page,
+                "per_page": per_page,
+            }
+            | include_filters.dict(exclude_unset=True)
+            if include_filters
+            else None,
         )
 
         return DtoResponse.from_response(local_response, models.MailDomainResource)

cyberfusion/CoreApiClient/resources/mail_hostnames.py

@@ -1,5 +1,4 @@
 from cyberfusion.CoreApiClient import models
-from typing import Optional, List
 
 from cyberfusion.CoreApiClient.interfaces import Resource
 from cyberfusion.CoreApiClient.http import DtoResponse
@@ -22,21 +21,21 @@ class MailHostnames(Resource):
     def list_mail_hostnames(
         self,
         *,
-        skip: Optional[int] = None,
-        limit: Optional[int] = None,
-        filter_: Optional[List[str]] = None,
-        sort: Optional[List[str]] = None,
+        page: int = 1,
+        per_page: int = 0,
+        include_filters: models.MailHostnamesSearchRequest | None = None,
     ) -> DtoResponse[list[models.MailHostnameResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
             "/api/v1/mail-hostnames",
             data=None,
             query_parameters={
-                "skip": skip,
-                "limit": limit,
-                "filter": filter_,
-                "sort": sort,
-            },
+                "page": page,
+                "per_page": per_page,
+            }
+            | include_filters.dict(exclude_unset=True)
+            if include_filters
+            else None,
         )
 
         return DtoResponse.from_response(local_response, models.MailHostnameResource)

cyberfusion/CoreApiClient/resources/malwares.py

@@ -1,5 +1,4 @@
 from cyberfusion.CoreApiClient import models
-from typing import Optional, List
 
 from cyberfusion.CoreApiClient.http import DtoResponse
 from cyberfusion.CoreApiClient.interfaces import Resource
@@ -9,21 +8,21 @@ class Malwares(Resource):
     def list_malwares(
         self,
         *,
-        skip: Optional[int] = None,
-        limit: Optional[int] = None,
-        filter_: Optional[List[str]] = None,
-        sort: Optional[List[str]] = None,
+        page: int = 1,
+        per_page: int = 0,
+        include_filters: models.MalwaresSearchRequest | None = None,
     ) -> DtoResponse[list[models.MalwareResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
             "/api/v1/malwares",
             data=None,
             query_parameters={
-                "skip": skip,
-                "limit": limit,
-                "filter": filter_,
-                "sort": sort,
-            },
+                "page": page,
+                "per_page": per_page,
+            }
+            | include_filters.dict(exclude_unset=True)
+            if include_filters
+            else None,
         )
 
         return DtoResponse.from_response(local_response, models.MalwareResource)

cyberfusion/CoreApiClient/resources/mariadb_encryption_keys.py

@@ -1,5 +1,4 @@
 from cyberfusion.CoreApiClient import models
-from typing import Optional, List
 
 from cyberfusion.CoreApiClient.interfaces import Resource
 from cyberfusion.CoreApiClient.http import DtoResponse
@@ -24,21 +23,21 @@ class MariaDBEncryptionKeys(Resource):
     def list_mariadb_encryption_keys(
         self,
         *,
-        skip: Optional[int] = None,
-        limit: Optional[int] = None,
-        filter_: Optional[List[str]] = None,
-        sort: Optional[List[str]] = None,
+        page: int = 1,
+        per_page: int = 0,
+        include_filters: models.MariadbEncryptionKeysSearchRequest | None = None,
     ) -> DtoResponse[list[models.MariaDBEncryptionKeyResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
             "/api/v1/mariadb-encryption-keys",
             data=None,
             query_parameters={
-                "skip": skip,
-                "limit": limit,
-                "filter": filter_,
-                "sort": sort,
-            },
+                "page": page,
+                "per_page": per_page,
+            }
+            | include_filters.dict(exclude_unset=True)
+            if include_filters
+            else None,
         )
 
         return DtoResponse.from_response(

cyberfusion/CoreApiClient/resources/node_add_ons.py

@@ -1,5 +1,5 @@
 from cyberfusion.CoreApiClient import models
-from typing import Optional, List
+from typing import Optional
 
 from cyberfusion.CoreApiClient.interfaces import Resource
 from cyberfusion.CoreApiClient.http import DtoResponse
@@ -9,12 +9,15 @@ class NodeAddOns(Resource):
     def create_node_add_on(
         self,
         request: models.NodeAddOnCreateRequest,
+        callback_url: Optional[str] = None,
     ) -> DtoResponse[models.TaskCollectionResource]:
         local_response = self.api_connector.send_or_fail(
             "POST",
             "/api/v1/node-add-ons",
             data=request.dict(exclude_unset=True),
-            query_parameters={},
+            query_parameters={
+                "callback_url": callback_url,
+            },
         )
 
         return DtoResponse.from_response(local_response, models.TaskCollectionResource)
@@ -22,21 +25,21 @@ class NodeAddOns(Resource):
     def list_node_add_ons(
         self,
         *,
-        skip: Optional[int] = None,
-        limit: Optional[int] = None,
-        filter_: Optional[List[str]] = None,
-        sort: Optional[List[str]] = None,
+        page: int = 1,
+        per_page: int = 0,
+        include_filters: models.NodeAddOnsSearchRequest | None = None,
     ) -> DtoResponse[list[models.NodeAddOnResource]]:
         local_response = self.api_connector.send_or_fail(
             "GET",
             "/api/v1/node-add-ons",
             data=None,
             query_parameters={
-                "skip": skip,
-                "limit": limit,
-                "filter": filter_,
-                "sort": sort,
-            },
+                "page": page,
+                "per_page": per_page,
+            }
+            | include_filters.dict(exclude_unset=True)
+            if include_filters
+            else None,
         )
 
         return DtoResponse.from_response(local_response, models.NodeAddOnResource)
@@ -65,9 +68,15 @@ class NodeAddOns(Resource):
         self,
         *,
         id_: int,
-    ) -> DtoResponse[models.DetailMessage]:
+        callback_url: Optional[str] = None,
+    ) -> DtoResponse[models.TaskCollectionResource]:
         local_response = self.api_connector.send_or_fail(
-            "DELETE", f"/api/v1/node-add-ons/{id_}", data=None, query_parameters={}
+            "DELETE",
+            f"/api/v1/node-add-ons/{id_}",
+            data=None,
+            query_parameters={
+                "callback_url": callback_url,
+            },
         )
 
-        return DtoResponse.from_response(local_response, models.DetailMessage)
+        return DtoResponse.from_response(local_response, models.TaskCollectionResource)