feat(cloud): support polling timeout in tasks.poll()

pedrodeoliveira · web-flow · commit 3f8a419a4867 · 2025-10-21T08:54:55.000+01:00
* feat(cloud): support polling timeout in tasks.poll()

* feat(cloud): add polling timeout to baremetal create_and_poll

* feat(cloud): remove timeout in client initialization of example scripts
diff --git a/examples/cloud/audit_logs.py b/examples/cloud/audit_logs.py
@@ -12,7 +12,6 @@ def main() -> None:
     # cloud_region_id = os.environ["GCORE_CLOUD_REGION_ID"]
 
     gcore = Gcore(
-        timeout=60.0,
         # No need to explicitly pass to Gcore constructor if using environment variables
         # api_key=api_key,
         # cloud_project_id=cloud_project_id,
diff --git a/examples/cloud/audit_logs_async.py b/examples/cloud/audit_logs_async.py
@@ -13,7 +13,6 @@ async def main() -> None:
     # cloud_region_id = os.environ["GCORE_CLOUD_REGION_ID"]
 
     gcore = AsyncGcore(
-        timeout=60.0,
         # No need to explicitly pass to AsyncGcore constructor if using environment variables
         # api_key=api_key,
         # cloud_project_id=cloud_project_id,
diff --git a/examples/cloud/baremetal.py b/examples/cloud/baremetal.py
@@ -17,7 +17,6 @@ def main() -> None:
     # cloud_region_id = os.environ["GCORE_CLOUD_REGION_ID"]
 
     gcore = Gcore(
-        timeout=1800.0,
         # No need to explicitly pass to Gcore constructor if using environment variables
         # api_key=api_key,
         # cloud_project_id=cloud_project_id,
diff --git a/examples/cloud/baremetal_async.py b/examples/cloud/baremetal_async.py
@@ -18,7 +18,6 @@ async def main() -> None:
     # cloud_region_id = os.environ["GCORE_CLOUD_REGION_ID"]
 
     gcore = AsyncGcore(
-        timeout=1800.0,
         # No need to explicitly pass to AsyncGcore constructor if using environment variables
         # api_key=api_key,
         # cloud_project_id=cloud_project_id,
diff --git a/examples/cloud/file_shares.py b/examples/cloud/file_shares.py
@@ -16,7 +16,6 @@ def main() -> None:
     cloud_network_id = os.environ["GCORE_CLOUD_NETWORK_ID"]
 
     gcore = Gcore(
-        timeout=180.0,
         # No need to explicitly pass to Gcore constructor if using environment variables
         # api_key=api_key,
         # cloud_project_id=cloud_project_id,
diff --git a/examples/cloud/file_shares_async.py b/examples/cloud/file_shares_async.py
@@ -17,7 +17,6 @@ async def main() -> None:
     cloud_network_id = os.environ["GCORE_CLOUD_NETWORK_ID"]
 
     gcore = AsyncGcore(
-        timeout=180.0,
         # No need to explicitly pass to AsyncGcore constructor if using environment variables
         # api_key=api_key,
         # cloud_project_id=cloud_project_id,
diff --git a/examples/cloud/inference.py b/examples/cloud/inference.py
@@ -20,7 +20,6 @@ def main() -> None:
     cloud_inference_flavor_name = os.environ["GCORE_CLOUD_INFERENCE_FLAVOR_NAME"]
 
     gcore = Gcore(
-        timeout=180.0,
         # No need to explicitly pass to Gcore constructor if using environment variables
         # api_key=api_key,
         # cloud_project_id=cloud_project_id,
diff --git a/examples/cloud/inference_async.py b/examples/cloud/inference_async.py
@@ -21,7 +21,6 @@ async def main() -> None:
     cloud_inference_flavor_name = os.environ["GCORE_CLOUD_INFERENCE_FLAVOR_NAME"]
 
     gcore = AsyncGcore(
-        timeout=180.0,
         # No need to explicitly pass to AsyncGcore constructor if using environment variables
         # api_key=api_key,
         # cloud_project_id=cloud_project_id,
diff --git a/examples/cloud/instances.py b/examples/cloud/instances.py
@@ -23,7 +23,6 @@ def main() -> None:
     placement_group_id = os.environ.get("GCORE_CLOUD_PLACEMENT_GROUP_ID")
 
     gcore = Gcore(
-        timeout=180.0,
         # No need to explicitly pass to Gcore constructor if using environment variables
         # api_key=api_key,
         # cloud_project_id=cloud_project_id,
diff --git a/examples/cloud/instances_async.py b/examples/cloud/instances_async.py
@@ -24,7 +24,6 @@ async def main() -> None:
     placement_group_id = os.environ.get("GCORE_CLOUD_PLACEMENT_GROUP_ID")
 
     gcore = AsyncGcore(
-        timeout=180.0,
         # No need to explicitly pass to AsyncGcore constructor if using environment variables
         # api_key=api_key,
         # cloud_project_id=cloud_project_id,
diff --git a/examples/cloud/load_balancers.py b/examples/cloud/load_balancers.py
@@ -10,7 +10,6 @@ def main() -> None:
     # cloud_region_id = os.environ["GCORE_CLOUD_REGION_ID"]
 
     gcore = Gcore(
-        timeout=180.0,
         # No need to explicitly pass to Gcore constructor if using environment variables
         # api_key=api_key,
         # cloud_project_id=cloud_project_id,
diff --git a/examples/cloud/load_balancers_async.py b/examples/cloud/load_balancers_async.py
@@ -14,7 +14,6 @@ async def main() -> None:
     # cloud_region_id = os.environ["GCORE_CLOUD_REGION_ID"]
 
     gcore = AsyncGcore(
-        timeout=180.0,
         # No need to explicitly pass to AsyncGcore constructor if using environment variables
         # api_key=api_key,
         # cloud_project_id=cloud_project_id,
diff --git a/src/gcore/resources/cloud/baremetal/servers.py b/src/gcore/resources/cloud/baremetal/servers.py
@@ -415,6 +415,7 @@ def create_and_poll(
         user_data: str | Omit = omit,
         username: str | 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,
@@ -450,6 +451,7 @@ def create_and_poll(
             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.instances:
             raise ValueError("No server was created")
diff --git a/src/gcore/resources/cloud/tasks.py b/src/gcore/resources/cloud/tasks.py
@@ -53,6 +53,7 @@ def poll(
         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 +66,22 @@ def poll(
         # 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")
