gcore 0.16.0__py3-none-any.whl → 0.23.0__py3-none-any.whl

gcore/resources/cloud/reserved_fixed_ips/reserved_fixed_ips.py

@@ -513,6 +513,7 @@ class ReservedFixedIPsResource(SyncAPIResource):
         ip_family: Optional[InterfaceIPFamily] | Omit = omit,
         is_vip: bool | Omit = omit,
         polling_interval_seconds: int | Omit = omit,
+        polling_timeout_seconds: int | Omit = omit,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
@@ -550,6 +551,7 @@ class ReservedFixedIPsResource(SyncAPIResource):
         type: Literal["subnet"],
         is_vip: bool | Omit = omit,
         polling_interval_seconds: int | Omit = omit,
+        polling_timeout_seconds: int | Omit = omit,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
@@ -588,6 +590,7 @@ class ReservedFixedIPsResource(SyncAPIResource):
         ip_family: Optional[InterfaceIPFamily] | Omit = omit,
         is_vip: bool | Omit = omit,
         polling_interval_seconds: int | Omit = omit,
+        polling_timeout_seconds: int | Omit = omit,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
@@ -628,6 +631,7 @@ class ReservedFixedIPsResource(SyncAPIResource):
         type: Literal["ip_address"],
         is_vip: bool | Omit = omit,
         polling_interval_seconds: int | Omit = omit,
+        polling_timeout_seconds: int | Omit = omit,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
@@ -666,6 +670,7 @@ class ReservedFixedIPsResource(SyncAPIResource):
         port_id: str,
         type: Literal["port"],
         polling_interval_seconds: int | Omit = omit,
+        polling_timeout_seconds: int | Omit = omit,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
@@ -712,6 +717,7 @@ class ReservedFixedIPsResource(SyncAPIResource):
         ip_address: str | Omit = omit,
         port_id: str | Omit = omit,
         polling_interval_seconds: int | Omit = omit,
+        polling_timeout_seconds: int | Omit = omit,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
@@ -743,6 +749,7 @@ class ReservedFixedIPsResource(SyncAPIResource):
             task_id=response.tasks[0],  # type: ignore
             extra_headers=extra_headers,
             polling_interval_seconds=polling_interval_seconds,
+            polling_timeout_seconds=polling_timeout_seconds,
         )
         if (
             task.created_resources is None
@@ -768,6 +775,7 @@ class ReservedFixedIPsResource(SyncAPIResource):
         project_id: int | None = None,
         region_id: int | None = None,
         polling_interval_seconds: int | Omit = omit,
+        polling_timeout_seconds: int | Omit = omit,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
@@ -793,6 +801,7 @@ class ReservedFixedIPsResource(SyncAPIResource):
             task_id=response.tasks[0],
             extra_headers=extra_headers,
             polling_interval_seconds=polling_interval_seconds,
+            polling_timeout_seconds=polling_timeout_seconds,
         )
 
 
@@ -1271,6 +1280,7 @@ class AsyncReservedFixedIPsResource(AsyncAPIResource):
         ip_family: Optional[InterfaceIPFamily] | Omit = omit,
         is_vip: bool | Omit = omit,
         polling_interval_seconds: int | Omit = omit,
+        polling_timeout_seconds: int | Omit = omit,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
@@ -1308,6 +1318,7 @@ class AsyncReservedFixedIPsResource(AsyncAPIResource):
         type: Literal["subnet"],
         is_vip: bool | Omit = omit,
         polling_interval_seconds: int | Omit = omit,
+        polling_timeout_seconds: int | Omit = omit,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
@@ -1346,6 +1357,7 @@ class AsyncReservedFixedIPsResource(AsyncAPIResource):
         ip_family: Optional[InterfaceIPFamily] | Omit = omit,
         is_vip: bool | Omit = omit,
         polling_interval_seconds: int | Omit = omit,
+        polling_timeout_seconds: int | Omit = omit,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
@@ -1386,6 +1398,7 @@ class AsyncReservedFixedIPsResource(AsyncAPIResource):
         type: Literal["ip_address"],
         is_vip: bool | Omit = omit,
         polling_interval_seconds: int | Omit = omit,
+        polling_timeout_seconds: int | Omit = omit,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
@@ -1424,6 +1437,7 @@ class AsyncReservedFixedIPsResource(AsyncAPIResource):
         port_id: str,
         type: Literal["port"],
         polling_interval_seconds: int | Omit = omit,
+        polling_timeout_seconds: int | Omit = omit,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
@@ -1470,6 +1484,7 @@ class AsyncReservedFixedIPsResource(AsyncAPIResource):
         ip_address: str | Omit = omit,
         port_id: str | Omit = omit,
         polling_interval_seconds: int | Omit = omit,
+        polling_timeout_seconds: int | Omit = omit,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
@@ -1501,6 +1516,7 @@ class AsyncReservedFixedIPsResource(AsyncAPIResource):
             task_id=response.tasks[0],  # type: ignore
             extra_headers=extra_headers,
             polling_interval_seconds=polling_interval_seconds,
+            polling_timeout_seconds=polling_timeout_seconds,
         )
         if (
             task.created_resources is None
@@ -1526,6 +1542,7 @@ class AsyncReservedFixedIPsResource(AsyncAPIResource):
         project_id: int | None = None,
         region_id: int | None = None,
         polling_interval_seconds: int | Omit = omit,
+        polling_timeout_seconds: int | Omit = omit,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
@@ -1551,6 +1568,7 @@ class AsyncReservedFixedIPsResource(AsyncAPIResource):
             task_id=response.tasks[0],
             extra_headers=extra_headers,
             polling_interval_seconds=polling_interval_seconds,
+            polling_timeout_seconds=polling_timeout_seconds,
         )
 
 

gcore/resources/cloud/secrets.py

@@ -260,6 +260,7 @@ class SecretsResource(SyncAPIResource):
         payload: secret_upload_tls_certificate_params.Payload,
         expiration: Union[str, datetime, None] | Omit = omit,
         polling_interval_seconds: int | Omit = omit,
+        polling_timeout_seconds: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -282,6 +283,7 @@ class SecretsResource(SyncAPIResource):
             task_id=response.tasks[0],
             extra_headers=extra_headers,
             polling_interval_seconds=polling_interval_seconds,
+            polling_timeout_seconds=polling_timeout_seconds,
         )
         if not task.created_resources or not task.created_resources.secrets or len(task.created_resources.secrets) != 1:
             raise ValueError(f"Expected exactly one resource to be created in a task")
@@ -527,6 +529,7 @@ class AsyncSecretsResource(AsyncAPIResource):
         payload: secret_upload_tls_certificate_params.Payload,
         expiration: Union[str, datetime, None] | Omit = omit,
         polling_interval_seconds: int | Omit = omit,
+        polling_timeout_seconds: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -549,6 +552,7 @@ class AsyncSecretsResource(AsyncAPIResource):
             task_id=response.tasks[0],
             extra_headers=extra_headers,
             polling_interval_seconds=polling_interval_seconds,
+            polling_timeout_seconds=polling_timeout_seconds,
         )
         if not task.created_resources or not task.created_resources.secrets or len(task.created_resources.secrets) != 1:
             raise ValueError(f"Expected exactly one resource to be created in a task")
@@ -576,6 +580,9 @@ class SecretsResourceWithRawResponse:
         self.upload_tls_certificate = to_raw_response_wrapper(
             secrets.upload_tls_certificate,
         )
+        self.upload_tls_certificate_and_poll = to_raw_response_wrapper(
+            secrets.upload_tls_certificate_and_poll,
+        )
 
 
 class AsyncSecretsResourceWithRawResponse:
@@ -594,6 +601,9 @@ class AsyncSecretsResourceWithRawResponse:
         self.upload_tls_certificate = async_to_raw_response_wrapper(
             secrets.upload_tls_certificate,
         )
+        self.upload_tls_certificate_and_poll = async_to_raw_response_wrapper(
+            secrets.upload_tls_certificate_and_poll,
+        )
 
 
 class SecretsResourceWithStreamingResponse:
@@ -612,6 +622,9 @@ class SecretsResourceWithStreamingResponse:
         self.upload_tls_certificate = to_streamed_response_wrapper(
             secrets.upload_tls_certificate,
         )
+        self.upload_tls_certificate_and_poll = to_streamed_response_wrapper(
+            secrets.upload_tls_certificate_and_poll,
+        )
 
 
 class AsyncSecretsResourceWithStreamingResponse:
@@ -630,3 +643,6 @@ class AsyncSecretsResourceWithStreamingResponse:
         self.upload_tls_certificate = async_to_streamed_response_wrapper(
             secrets.upload_tls_certificate,
         )
+        self.upload_tls_certificate_and_poll = async_to_streamed_response_wrapper(
+            secrets.upload_tls_certificate_and_poll,
+        )

gcore/resources/cloud/security_groups/security_groups.py

@@ -80,6 +80,10 @@ class SecurityGroupsResource(SyncAPIResource):
         Create a new security group with the specified configuration.
 
         Args:
+          project_id: Project ID
+
+          region_id: Region ID
+
           security_group: Security group
 
           instances: List of instances
@@ -145,15 +149,20 @@ class SecurityGroupsResource(SyncAPIResource):
               - **Add/update tags:**
                 `{'tags': {'environment': 'production', 'team': 'backend'}}` adds new tags or
                 updates existing ones.
-              - **Delete tags:** `{'tags': {'`old_tag`': null}}` removes specific tags.
+
+              - **Delete tags:** `{'tags': {'old_tag': null}}` removes specific tags.
+
               - **Remove all tags:** `{'tags': null}` removes all user-managed tags (read-only
                 tags are preserved).
+
               - **Partial update:** `{'tags': {'environment': 'staging'}}` only updates
                 specified tags.
+
               - **Mixed operations:**
-                `{'tags': {'environment': 'production', '`cost_center`': 'engineering', '`deprecated_tag`': null}}`
+                `{'tags': {'environment': 'production', 'cost_center': 'engineering', 'deprecated_tag': null}}`
                 adds/updates 'environment' and '`cost_center`' while removing
                 '`deprecated_tag`', preserving other existing tags.
+
               - **Replace all:** first delete existing tags with null values, then add new
                 ones in the same request.
 
@@ -207,13 +216,17 @@ class SecurityGroupsResource(SyncAPIResource):
         List all security groups in the specified project and region.
 
         Args:
-          limit: Limit the number of returned security groups
+          project_id: Project ID
+
+          region_id: Region ID
+
+          limit: Limit of items on a single page
 
-          offset: Offset value is used to exclude the first set of records from the result
+          offset: Offset in results list
 
-          tag_key: Filter by tag keys.
+          tag_key: Optional. Filter by tag keys.
 
-          tag_key_value: Filter by tag key-value pairs. Must be a valid JSON string.
+          tag_key_value: Optional. Filter by tag key-value pairs. Must be a valid JSON string.
 
           extra_headers: Send extra headers
 
@@ -452,6 +465,10 @@ class AsyncSecurityGroupsResource(AsyncAPIResource):
         Create a new security group with the specified configuration.
 
         Args:
+          project_id: Project ID
+
+          region_id: Region ID
+
           security_group: Security group
 
           instances: List of instances
@@ -517,15 +534,20 @@ class AsyncSecurityGroupsResource(AsyncAPIResource):
               - **Add/update tags:**
                 `{'tags': {'environment': 'production', 'team': 'backend'}}` adds new tags or
                 updates existing ones.
-              - **Delete tags:** `{'tags': {'`old_tag`': null}}` removes specific tags.
+
+              - **Delete tags:** `{'tags': {'old_tag': null}}` removes specific tags.
+
               - **Remove all tags:** `{'tags': null}` removes all user-managed tags (read-only
                 tags are preserved).
+
               - **Partial update:** `{'tags': {'environment': 'staging'}}` only updates
                 specified tags.
+
               - **Mixed operations:**
-                `{'tags': {'environment': 'production', '`cost_center`': 'engineering', '`deprecated_tag`': null}}`
+                `{'tags': {'environment': 'production', 'cost_center': 'engineering', 'deprecated_tag': null}}`
                 adds/updates 'environment' and '`cost_center`' while removing
                 '`deprecated_tag`', preserving other existing tags.
+
               - **Replace all:** first delete existing tags with null values, then add new
                 ones in the same request.
 
@@ -579,13 +601,17 @@ class AsyncSecurityGroupsResource(AsyncAPIResource):
         List all security groups in the specified project and region.
 
         Args:
-          limit: Limit the number of returned security groups
+          project_id: Project ID
+
+          region_id: Region ID
+
+          limit: Limit of items on a single page
 
-          offset: Offset value is used to exclude the first set of records from the result
+          offset: Offset in results list
 
-          tag_key: Filter by tag keys.
+          tag_key: Optional. Filter by tag keys.
 
-          tag_key_value: Filter by tag key-value pairs. Must be a valid JSON string.
+          tag_key_value: Optional. Filter by tag key-value pairs. Must be a valid JSON string.
 
           extra_headers: Send extra headers
 

gcore/resources/cloud/ssh_keys.py

@@ -154,6 +154,7 @@ class SSHKeysResource(SyncAPIResource):
         *,
         project_id: int | None = None,
         limit: int | Omit = omit,
+        name: str | Omit = omit,
         offset: int | Omit = omit,
         order_by: Literal["created_at.asc", "created_at.desc", "name.asc", "name.desc"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
@@ -171,6 +172,9 @@ class SSHKeysResource(SyncAPIResource):
 
           limit: Maximum number of SSH keys to return
 
+          name: SSH key name. Partial substring match. Example: `name=abc` matches any key
+              containing `abc` in name.
+
           offset: Offset for pagination
 
           order_by: Sort order for the SSH keys
@@ -196,6 +200,7 @@ class SSHKeysResource(SyncAPIResource):
                 query=maybe_transform(
                     {
                         "limit": limit,
+                        "name": name,
                         "offset": offset,
                         "order_by": order_by,
                     },
@@ -418,6 +423,7 @@ class AsyncSSHKeysResource(AsyncAPIResource):
         *,
         project_id: int | None = None,
         limit: int | Omit = omit,
+        name: str | Omit = omit,
         offset: int | Omit = omit,
         order_by: Literal["created_at.asc", "created_at.desc", "name.asc", "name.desc"] | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
@@ -435,6 +441,9 @@ class AsyncSSHKeysResource(AsyncAPIResource):
 
           limit: Maximum number of SSH keys to return
 
+          name: SSH key name. Partial substring match. Example: `name=abc` matches any key
+              containing `abc` in name.
+
           offset: Offset for pagination
 
           order_by: Sort order for the SSH keys
@@ -460,6 +469,7 @@ class AsyncSSHKeysResource(AsyncAPIResource):
                 query=maybe_transform(
                     {
                         "limit": limit,
+                        "name": name,
                         "offset": offset,
                         "order_by": order_by,
                     },

gcore/resources/cloud/tasks.py

@@ -20,7 +20,6 @@ from ..._response import (
     async_to_streamed_response_wrapper,
 )
 from ...pagination import SyncOffsetPage, AsyncOffsetPage
-from ...lib.polling import extract_timeout_value
 from ...types.cloud import task_list_params, task_acknowledge_all_params
 from ..._base_client import AsyncPaginator, make_request_options
 from ...types.cloud.task import Task
@@ -53,6 +52,7 @@ class TasksResource(SyncAPIResource):
         task_id: str,
         *,
         polling_interval_seconds: int | Omit = omit,
+        polling_timeout_seconds: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -65,16 +65,22 @@ class TasksResource(SyncAPIResource):
         # Ensure the polling interval is at least 1 second
         polling_interval_seconds = max(1, polling_interval_seconds)
 
-        if not is_given(timeout):
-            timeout = extract_timeout_value(self._client.timeout)
+        if not is_given(polling_timeout_seconds):
+            polling_timeout_seconds = cast(int, self._client.cloud_polling_timeout_seconds)
 
-        end_time = time.time() + timeout
+        if polling_timeout_seconds <= polling_interval_seconds:
+            raise ValueError(
+                f"`polling_timeout_seconds` must be greater than `polling_interval_seconds` ({polling_interval_seconds})"
+            )
+
+        end_time = time.time() + polling_timeout_seconds
         while time.time() <= end_time:
             task = self.get(
                 task_id,
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
+                timeout=timeout,
             )
             if task.state == "ERROR":
                 raise ValueError(task.error or f"Task {task_id} failed")
@@ -364,6 +370,7 @@ class AsyncTasksResource(AsyncAPIResource):
         task_id: str,
         *,
         polling_interval_seconds: int | Omit = omit,
+        polling_timeout_seconds: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -373,17 +380,25 @@ class AsyncTasksResource(AsyncAPIResource):
     ) -> Task:
         if not is_given(polling_interval_seconds):
             polling_interval_seconds = cast(int, self._client.cloud_polling_interval_seconds)
+        # Ensure the polling interval is at least 1 second
+        polling_interval_seconds = max(1, polling_interval_seconds)
+
+        if not is_given(polling_timeout_seconds):
+            polling_timeout_seconds = cast(int, self._client.cloud_polling_timeout_seconds)
 
-        if not is_given(timeout):
-            timeout = extract_timeout_value(self._client.timeout)
+        if polling_timeout_seconds <= polling_interval_seconds:
+            raise ValueError(
+                f"`polling_timeout_seconds` must be greater than `polling_interval_seconds` ({polling_interval_seconds})"
+            )
 
-        end_time = time.time() + timeout
+        end_time = time.time() + polling_timeout_seconds
         while time.time() <= end_time:
             task = await self.get(
                 task_id,
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
+                timeout=timeout,
             )
             if task.state == "ERROR":
                 raise ValueError(task.error or f"Task {task_id} failed")