gcore 0.15.0__py3-none-any.whl → 0.17.0__py3-none-any.whl

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")
@@ -178,9 +184,9 @@ class TasksResource(SyncAPIResource):
               '`suspend_vm`', '`sync_private_flavors`', '`update_ddos_profile`',
               '`update_inference_application`', '`update_inference_instance`',
               '`update_k8s_cluster_v2`', '`update_lbmetadata`',
-              '`update_port_allowed_address_pairs`', '`update_tags_gpu_virtual_cluster`',
-              '`upgrade_k8s_cluster_v2`', '`upscale_ai_cluster_gpu`',
-              '`upscale_gpu_virtual_cluster`']
+              '`update_port_allowed_address_pairs`', '`update_sfs`',
+              '`update_tags_gpu_virtual_cluster`', '`upgrade_k8s_cluster_v2`',
+              '`upscale_ai_cluster_gpu`', '`upscale_gpu_virtual_cluster`']
 
           to_timestamp: ISO formatted datetime string. Filter the tasks by creation date less than or
               equal to `to_timestamp`
@@ -194,7 +200,7 @@ class TasksResource(SyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._get_api_list(
-            "/cloud/v1/tasks" if self._client._base_url_overridden else "https://api.gcore.com//cloud/v1/tasks",
+            "/cloud/v1/tasks",
             page=SyncOffsetPage[Task],
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -251,9 +257,7 @@ class TasksResource(SyncAPIResource):
         """
         extra_headers = {"Accept": "*/*", **(extra_headers or {})}
         return self._post(
-            "/cloud/v1/tasks/acknowledge_all"
-            if self._client._base_url_overridden
-            else "https://api.gcore.com//cloud/v1/tasks/acknowledge_all",
+            "/cloud/v1/tasks/acknowledge_all",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -298,9 +302,7 @@ class TasksResource(SyncAPIResource):
         if not task_id:
             raise ValueError(f"Expected a non-empty value for `task_id` but received {task_id!r}")
         return self._post(
-            f"/cloud/v1/tasks/{task_id}/acknowledge"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cloud/v1/tasks/{task_id}/acknowledge",
+            f"/cloud/v1/tasks/{task_id}/acknowledge",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -335,9 +337,7 @@ class TasksResource(SyncAPIResource):
         if not task_id:
             raise ValueError(f"Expected a non-empty value for `task_id` but received {task_id!r}")
         return self._get(
-            f"/cloud/v1/tasks/{task_id}"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cloud/v1/tasks/{task_id}",
+            f"/cloud/v1/tasks/{task_id}",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -370,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,
@@ -379,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")
@@ -493,9 +502,9 @@ class AsyncTasksResource(AsyncAPIResource):
               '`suspend_vm`', '`sync_private_flavors`', '`update_ddos_profile`',
               '`update_inference_application`', '`update_inference_instance`',
               '`update_k8s_cluster_v2`', '`update_lbmetadata`',
-              '`update_port_allowed_address_pairs`', '`update_tags_gpu_virtual_cluster`',
-              '`upgrade_k8s_cluster_v2`', '`upscale_ai_cluster_gpu`',
-              '`upscale_gpu_virtual_cluster`']
+              '`update_port_allowed_address_pairs`', '`update_sfs`',
+              '`update_tags_gpu_virtual_cluster`', '`upgrade_k8s_cluster_v2`',
+              '`upscale_ai_cluster_gpu`', '`upscale_gpu_virtual_cluster`']
 
           to_timestamp: ISO formatted datetime string. Filter the tasks by creation date less than or
               equal to `to_timestamp`
@@ -509,7 +518,7 @@ class AsyncTasksResource(AsyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._get_api_list(
-            "/cloud/v1/tasks" if self._client._base_url_overridden else "https://api.gcore.com//cloud/v1/tasks",
+            "/cloud/v1/tasks",
             page=AsyncOffsetPage[Task],
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -566,9 +575,7 @@ class AsyncTasksResource(AsyncAPIResource):
         """
         extra_headers = {"Accept": "*/*", **(extra_headers or {})}
         return await self._post(
-            "/cloud/v1/tasks/acknowledge_all"
-            if self._client._base_url_overridden
-            else "https://api.gcore.com//cloud/v1/tasks/acknowledge_all",
+            "/cloud/v1/tasks/acknowledge_all",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -613,9 +620,7 @@ class AsyncTasksResource(AsyncAPIResource):
         if not task_id:
             raise ValueError(f"Expected a non-empty value for `task_id` but received {task_id!r}")
         return await self._post(
-            f"/cloud/v1/tasks/{task_id}/acknowledge"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cloud/v1/tasks/{task_id}/acknowledge",
+            f"/cloud/v1/tasks/{task_id}/acknowledge",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -650,9 +655,7 @@ class AsyncTasksResource(AsyncAPIResource):
         if not task_id:
             raise ValueError(f"Expected a non-empty value for `task_id` but received {task_id!r}")
         return await self._get(
-            f"/cloud/v1/tasks/{task_id}"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cloud/v1/tasks/{task_id}",
+            f"/cloud/v1/tasks/{task_id}",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),

gcore/resources/cloud/usage_reports.py

@@ -95,21 +95,20 @@ class UsageReportsResource(SyncAPIResource):
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> UsageReport:
-        """Receiving data from the past hour might lead to incomplete statistics.
+        """Data from the past hour may not reflect the full set of statistics.
 
-        For the
-        most accurate data, we recommend accessing the statistics after at least one
-        hour. Typically, updates are available within a 24-hour period, although the
-        frequency can vary. Maintenance periods or other exceptions may cause delays,
-        potentially extending beyond 24 hours until the servers are back online and the
-        missing data is filled in.
+        For the most
+        complete and accurate results, we recommend accessing the data at least one hour
+        after the relevant time period. Updates are generally available within a 24-hour
+        window, though timing can vary. Scheduled maintenance or other exceptions may
+        occasionally cause delays beyond 24 hours.
 
         Args:
           time_from: The start date of the report period (ISO 8601). The report starts from the
-              beginning of this day.
+              beginning of this day in UTC.
 
           time_to: The end date of the report period (ISO 8601). The report ends just before the
-              beginning of this day.
+              beginning of this day in UTC.
 
           enable_last_day: Expenses for the last specified day are taken into account. As the default,
               False.
@@ -139,9 +138,7 @@ class UsageReportsResource(SyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._post(
-            "/cloud/v1/usage_report"
-            if self._client._base_url_overridden
-            else "https://api.gcore.com//cloud/v1/usage_report",
+            "/cloud/v1/usage_report",
             body=maybe_transform(
                 {
                     "time_from": time_from,
@@ -235,21 +232,20 @@ class AsyncUsageReportsResource(AsyncAPIResource):
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> UsageReport:
-        """Receiving data from the past hour might lead to incomplete statistics.
+        """Data from the past hour may not reflect the full set of statistics.
 
-        For the
-        most accurate data, we recommend accessing the statistics after at least one
-        hour. Typically, updates are available within a 24-hour period, although the
-        frequency can vary. Maintenance periods or other exceptions may cause delays,
-        potentially extending beyond 24 hours until the servers are back online and the
-        missing data is filled in.
+        For the most
+        complete and accurate results, we recommend accessing the data at least one hour
+        after the relevant time period. Updates are generally available within a 24-hour
+        window, though timing can vary. Scheduled maintenance or other exceptions may
+        occasionally cause delays beyond 24 hours.
 
         Args:
           time_from: The start date of the report period (ISO 8601). The report starts from the
-              beginning of this day.
+              beginning of this day in UTC.
 
           time_to: The end date of the report period (ISO 8601). The report ends just before the
-              beginning of this day.
+              beginning of this day in UTC.
 
           enable_last_day: Expenses for the last specified day are taken into account. As the default,
               False.
@@ -279,9 +275,7 @@ class AsyncUsageReportsResource(AsyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return await self._post(
-            "/cloud/v1/usage_report"
-            if self._client._base_url_overridden
-            else "https://api.gcore.com//cloud/v1/usage_report",
+            "/cloud/v1/usage_report",
             body=await async_maybe_transform(
                 {
                     "time_from": time_from,

gcore/resources/cloud/users/role_assignments.py

@@ -85,9 +85,7 @@ class RoleAssignmentsResource(SyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._post(
-            "/cloud/v1/users/assignments"
-            if self._client._base_url_overridden
-            else "https://api.gcore.com//cloud/v1/users/assignments",
+            "/cloud/v1/users/assignments",
             body=maybe_transform(
                 {
                     "role": role,
@@ -141,9 +139,7 @@ class RoleAssignmentsResource(SyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._patch(
-            f"/cloud/v1/users/assignments/{assignment_id}"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cloud/v1/users/assignments/{assignment_id}",
+            f"/cloud/v1/users/assignments/{assignment_id}",
             body=maybe_transform(
                 {
                     "role": role,
@@ -195,9 +191,7 @@ class RoleAssignmentsResource(SyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._get_api_list(
-            "/cloud/v1/users/assignments"
-            if self._client._base_url_overridden
-            else "https://api.gcore.com//cloud/v1/users/assignments",
+            "/cloud/v1/users/assignments",
             page=SyncOffsetPage[RoleAssignment],
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -243,9 +237,7 @@ class RoleAssignmentsResource(SyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._delete(
-            f"/cloud/v1/users/assignments/{assignment_id}"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cloud/v1/users/assignments/{assignment_id}",
+            f"/cloud/v1/users/assignments/{assignment_id}",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -308,9 +300,7 @@ class AsyncRoleAssignmentsResource(AsyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return await self._post(
-            "/cloud/v1/users/assignments"
-            if self._client._base_url_overridden
-            else "https://api.gcore.com//cloud/v1/users/assignments",
+            "/cloud/v1/users/assignments",
             body=await async_maybe_transform(
                 {
                     "role": role,
@@ -364,9 +354,7 @@ class AsyncRoleAssignmentsResource(AsyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return await self._patch(
-            f"/cloud/v1/users/assignments/{assignment_id}"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cloud/v1/users/assignments/{assignment_id}",
+            f"/cloud/v1/users/assignments/{assignment_id}",
             body=await async_maybe_transform(
                 {
                     "role": role,
@@ -418,9 +406,7 @@ class AsyncRoleAssignmentsResource(AsyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._get_api_list(
-            "/cloud/v1/users/assignments"
-            if self._client._base_url_overridden
-            else "https://api.gcore.com//cloud/v1/users/assignments",
+            "/cloud/v1/users/assignments",
             page=AsyncOffsetPage[RoleAssignment],
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -466,9 +452,7 @@ class AsyncRoleAssignmentsResource(AsyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return await self._delete(
-            f"/cloud/v1/users/assignments/{assignment_id}"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cloud/v1/users/assignments/{assignment_id}",
+            f"/cloud/v1/users/assignments/{assignment_id}",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),