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

gcore/resources/cloud/volumes.py

@@ -288,9 +288,7 @@ class VolumesResource(SyncAPIResource):
         if region_id is None:
             region_id = self._client._get_cloud_region_id_path_param()
         return self._post(
-            f"/cloud/v1/volumes/{project_id}/{region_id}"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cloud/v1/volumes/{project_id}/{region_id}",
+            f"/cloud/v1/volumes/{project_id}/{region_id}",
             body=maybe_transform(
                 {
                     "image_id": image_id,
@@ -376,9 +374,7 @@ class VolumesResource(SyncAPIResource):
         if not volume_id:
             raise ValueError(f"Expected a non-empty value for `volume_id` but received {volume_id!r}")
         return self._patch(
-            f"/cloud/v1/volumes/{project_id}/{region_id}/{volume_id}"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cloud/v1/volumes/{project_id}/{region_id}/{volume_id}",
+            f"/cloud/v1/volumes/{project_id}/{region_id}/{volume_id}",
             body=maybe_transform(
                 {
                     "name": name,
@@ -460,9 +456,7 @@ class VolumesResource(SyncAPIResource):
         if region_id is None:
             region_id = self._client._get_cloud_region_id_path_param()
         return self._get_api_list(
-            f"/cloud/v1/volumes/{project_id}/{region_id}"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cloud/v1/volumes/{project_id}/{region_id}",
+            f"/cloud/v1/volumes/{project_id}/{region_id}",
             page=SyncOffsetPage[Volume],
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -531,9 +525,7 @@ class VolumesResource(SyncAPIResource):
         if not volume_id:
             raise ValueError(f"Expected a non-empty value for `volume_id` but received {volume_id!r}")
         return self._delete(
-            f"/cloud/v1/volumes/{project_id}/{region_id}/{volume_id}"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cloud/v1/volumes/{project_id}/{region_id}/{volume_id}",
+            f"/cloud/v1/volumes/{project_id}/{region_id}/{volume_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -590,9 +582,7 @@ class VolumesResource(SyncAPIResource):
         if not volume_id:
             raise ValueError(f"Expected a non-empty value for `volume_id` but received {volume_id!r}")
         return self._post(
-            f"/cloud/v2/volumes/{project_id}/{region_id}/{volume_id}/attach"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cloud/v2/volumes/{project_id}/{region_id}/{volume_id}/attach",
+            f"/cloud/v2/volumes/{project_id}/{region_id}/{volume_id}/attach",
             body=maybe_transform(
                 {
                     "instance_id": instance_id,
@@ -649,9 +639,7 @@ class VolumesResource(SyncAPIResource):
         if not volume_id:
             raise ValueError(f"Expected a non-empty value for `volume_id` but received {volume_id!r}")
         return self._post(
-            f"/cloud/v1/volumes/{project_id}/{region_id}/{volume_id}/retype"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cloud/v1/volumes/{project_id}/{region_id}/{volume_id}/retype",
+            f"/cloud/v1/volumes/{project_id}/{region_id}/{volume_id}/retype",
             body=maybe_transform({"volume_type": volume_type}, volume_change_type_params.VolumeChangeTypeParams),
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
@@ -700,9 +688,7 @@ class VolumesResource(SyncAPIResource):
         if not volume_id:
             raise ValueError(f"Expected a non-empty value for `volume_id` but received {volume_id!r}")
         return self._post(
-            f"/cloud/v2/volumes/{project_id}/{region_id}/{volume_id}/detach"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cloud/v2/volumes/{project_id}/{region_id}/{volume_id}/detach",
+            f"/cloud/v2/volumes/{project_id}/{region_id}/{volume_id}/detach",
             body=maybe_transform(
                 {"instance_id": instance_id}, volume_detach_from_instance_params.VolumeDetachFromInstanceParams
             ),
@@ -750,9 +736,7 @@ class VolumesResource(SyncAPIResource):
         if not volume_id:
             raise ValueError(f"Expected a non-empty value for `volume_id` but received {volume_id!r}")
         return self._get(
-            f"/cloud/v1/volumes/{project_id}/{region_id}/{volume_id}"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cloud/v1/volumes/{project_id}/{region_id}/{volume_id}",
+            f"/cloud/v1/volumes/{project_id}/{region_id}/{volume_id}",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -802,9 +786,7 @@ class VolumesResource(SyncAPIResource):
         if not volume_id:
             raise ValueError(f"Expected a non-empty value for `volume_id` but received {volume_id!r}")
         return self._post(
-            f"/cloud/v1/volumes/{project_id}/{region_id}/{volume_id}/extend"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cloud/v1/volumes/{project_id}/{region_id}/{volume_id}/extend",
+            f"/cloud/v1/volumes/{project_id}/{region_id}/{volume_id}/extend",
             body=maybe_transform({"size": size}, volume_resize_params.VolumeResizeParams),
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
@@ -853,9 +835,7 @@ class VolumesResource(SyncAPIResource):
             raise ValueError(f"Expected a non-empty value for `volume_id` but received {volume_id!r}")
         extra_headers = {"Accept": "*/*", **(extra_headers or {})}
         return self._post(
-            f"/cloud/v1/volumes/{project_id}/{region_id}/{volume_id}/revert"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cloud/v1/volumes/{project_id}/{region_id}/{volume_id}/revert",
+            f"/cloud/v1/volumes/{project_id}/{region_id}/{volume_id}/revert",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -879,6 +859,7 @@ class VolumesResource(SyncAPIResource):
         type_name: Literal["cold", "ssd_hiiops", "ssd_local", "ssd_lowlatency", "standard", "ultra"]
         | 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.
@@ -949,6 +930,7 @@ class VolumesResource(SyncAPIResource):
         type_name: Literal["cold", "ssd_hiiops", "ssd_local", "ssd_lowlatency", "standard", "ultra"]
         | 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.
@@ -1019,6 +1001,7 @@ class VolumesResource(SyncAPIResource):
         type_name: Literal["cold", "ssd_hiiops", "ssd_local", "ssd_lowlatency", "standard", "ultra"]
         | 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.
@@ -1090,6 +1073,7 @@ class VolumesResource(SyncAPIResource):
         | Omit = omit,
         snapshot_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.
@@ -1122,6 +1106,7 @@ class VolumesResource(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 or task.created_resources.volumes is None or len(task.created_resources.volumes) != 1:
             raise ValueError("Task completed but created_resources or volumes is missing or invalid")
@@ -1144,6 +1129,7 @@ class VolumesResource(SyncAPIResource):
         region_id: int | None = None,
         snapshots: 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.
@@ -1168,6 +1154,7 @@ class VolumesResource(SyncAPIResource):
             task_id=response.tasks[0],
             extra_headers=extra_headers,
             polling_interval_seconds=polling_interval_seconds,
+            polling_timeout_seconds=polling_timeout_seconds,
         )
 
     def attach_to_instance_and_poll(
@@ -1179,6 +1166,7 @@ class VolumesResource(SyncAPIResource):
         instance_id: str,
         attachment_tag: 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.
@@ -1204,6 +1192,7 @@ class VolumesResource(SyncAPIResource):
             task_id=response.tasks[0],
             extra_headers=extra_headers,
             polling_interval_seconds=polling_interval_seconds,
+            polling_timeout_seconds=polling_timeout_seconds,
         )
 
     def detach_from_instance_and_poll(
@@ -1214,6 +1203,7 @@ class VolumesResource(SyncAPIResource):
         region_id: int | None = None,
         instance_id: str,
         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.
@@ -1238,6 +1228,7 @@ class VolumesResource(SyncAPIResource):
             task_id=response.tasks[0],
             extra_headers=extra_headers,
             polling_interval_seconds=polling_interval_seconds,
+            polling_timeout_seconds=polling_timeout_seconds,
         )
 
     def resize_and_poll(
@@ -1248,6 +1239,7 @@ class VolumesResource(SyncAPIResource):
         region_id: int | None = None,
         size: int,
         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.
@@ -1272,6 +1264,7 @@ class VolumesResource(SyncAPIResource):
             task_id=response.tasks[0],
             extra_headers=extra_headers,
             polling_interval_seconds=polling_interval_seconds,
+            polling_timeout_seconds=polling_timeout_seconds,
         )
         return self.get(
             volume_id=volume_id,
@@ -1536,9 +1529,7 @@ class AsyncVolumesResource(AsyncAPIResource):
         if region_id is None:
             region_id = self._client._get_cloud_region_id_path_param()
         return await self._post(
-            f"/cloud/v1/volumes/{project_id}/{region_id}"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cloud/v1/volumes/{project_id}/{region_id}",
+            f"/cloud/v1/volumes/{project_id}/{region_id}",
             body=await async_maybe_transform(
                 {
                     "image_id": image_id,
@@ -1624,9 +1615,7 @@ class AsyncVolumesResource(AsyncAPIResource):
         if not volume_id:
             raise ValueError(f"Expected a non-empty value for `volume_id` but received {volume_id!r}")
         return await self._patch(
-            f"/cloud/v1/volumes/{project_id}/{region_id}/{volume_id}"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cloud/v1/volumes/{project_id}/{region_id}/{volume_id}",
+            f"/cloud/v1/volumes/{project_id}/{region_id}/{volume_id}",
             body=await async_maybe_transform(
                 {
                     "name": name,
@@ -1708,9 +1697,7 @@ class AsyncVolumesResource(AsyncAPIResource):
         if region_id is None:
             region_id = self._client._get_cloud_region_id_path_param()
         return self._get_api_list(
-            f"/cloud/v1/volumes/{project_id}/{region_id}"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cloud/v1/volumes/{project_id}/{region_id}",
+            f"/cloud/v1/volumes/{project_id}/{region_id}",
             page=AsyncOffsetPage[Volume],
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -1779,9 +1766,7 @@ class AsyncVolumesResource(AsyncAPIResource):
         if not volume_id:
             raise ValueError(f"Expected a non-empty value for `volume_id` but received {volume_id!r}")
         return await self._delete(
-            f"/cloud/v1/volumes/{project_id}/{region_id}/{volume_id}"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cloud/v1/volumes/{project_id}/{region_id}/{volume_id}",
+            f"/cloud/v1/volumes/{project_id}/{region_id}/{volume_id}",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -1838,9 +1823,7 @@ class AsyncVolumesResource(AsyncAPIResource):
         if not volume_id:
             raise ValueError(f"Expected a non-empty value for `volume_id` but received {volume_id!r}")
         return await self._post(
-            f"/cloud/v2/volumes/{project_id}/{region_id}/{volume_id}/attach"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cloud/v2/volumes/{project_id}/{region_id}/{volume_id}/attach",
+            f"/cloud/v2/volumes/{project_id}/{region_id}/{volume_id}/attach",
             body=await async_maybe_transform(
                 {
                     "instance_id": instance_id,
@@ -1897,9 +1880,7 @@ class AsyncVolumesResource(AsyncAPIResource):
         if not volume_id:
             raise ValueError(f"Expected a non-empty value for `volume_id` but received {volume_id!r}")
         return await self._post(
-            f"/cloud/v1/volumes/{project_id}/{region_id}/{volume_id}/retype"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cloud/v1/volumes/{project_id}/{region_id}/{volume_id}/retype",
+            f"/cloud/v1/volumes/{project_id}/{region_id}/{volume_id}/retype",
             body=await async_maybe_transform(
                 {"volume_type": volume_type}, volume_change_type_params.VolumeChangeTypeParams
             ),
@@ -1950,9 +1931,7 @@ class AsyncVolumesResource(AsyncAPIResource):
         if not volume_id:
             raise ValueError(f"Expected a non-empty value for `volume_id` but received {volume_id!r}")
         return await self._post(
-            f"/cloud/v2/volumes/{project_id}/{region_id}/{volume_id}/detach"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cloud/v2/volumes/{project_id}/{region_id}/{volume_id}/detach",
+            f"/cloud/v2/volumes/{project_id}/{region_id}/{volume_id}/detach",
             body=await async_maybe_transform(
                 {"instance_id": instance_id}, volume_detach_from_instance_params.VolumeDetachFromInstanceParams
             ),
@@ -2000,9 +1979,7 @@ class AsyncVolumesResource(AsyncAPIResource):
         if not volume_id:
             raise ValueError(f"Expected a non-empty value for `volume_id` but received {volume_id!r}")
         return await self._get(
-            f"/cloud/v1/volumes/{project_id}/{region_id}/{volume_id}"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cloud/v1/volumes/{project_id}/{region_id}/{volume_id}",
+            f"/cloud/v1/volumes/{project_id}/{region_id}/{volume_id}",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -2052,9 +2029,7 @@ class AsyncVolumesResource(AsyncAPIResource):
         if not volume_id:
             raise ValueError(f"Expected a non-empty value for `volume_id` but received {volume_id!r}")
         return await self._post(
-            f"/cloud/v1/volumes/{project_id}/{region_id}/{volume_id}/extend"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cloud/v1/volumes/{project_id}/{region_id}/{volume_id}/extend",
+            f"/cloud/v1/volumes/{project_id}/{region_id}/{volume_id}/extend",
             body=await async_maybe_transform({"size": size}, volume_resize_params.VolumeResizeParams),
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
@@ -2103,9 +2078,7 @@ class AsyncVolumesResource(AsyncAPIResource):
             raise ValueError(f"Expected a non-empty value for `volume_id` but received {volume_id!r}")
         extra_headers = {"Accept": "*/*", **(extra_headers or {})}
         return await self._post(
-            f"/cloud/v1/volumes/{project_id}/{region_id}/{volume_id}/revert"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cloud/v1/volumes/{project_id}/{region_id}/{volume_id}/revert",
+            f"/cloud/v1/volumes/{project_id}/{region_id}/{volume_id}/revert",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -2129,6 +2102,7 @@ class AsyncVolumesResource(AsyncAPIResource):
         type_name: Literal["cold", "ssd_hiiops", "ssd_local", "ssd_lowlatency", "standard", "ultra"]
         | 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.
@@ -2199,6 +2173,7 @@ class AsyncVolumesResource(AsyncAPIResource):
         type_name: Literal["cold", "ssd_hiiops", "ssd_local", "ssd_lowlatency", "standard", "ultra"]
         | 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.
@@ -2269,6 +2244,7 @@ class AsyncVolumesResource(AsyncAPIResource):
         type_name: Literal["cold", "ssd_hiiops", "ssd_local", "ssd_lowlatency", "standard", "ultra"]
         | 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.
@@ -2340,6 +2316,7 @@ class AsyncVolumesResource(AsyncAPIResource):
         | Omit = omit,
         snapshot_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.
@@ -2368,10 +2345,11 @@ class AsyncVolumesResource(AsyncAPIResource):
         )
         if not response.tasks:  # type: ignore
             raise ValueError("Expected at least one task to be created")
-        task = await self._client.cloud.tasks.poll(
+        task =         await self._client.cloud.tasks.poll(
             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 or task.created_resources.volumes is None or len(task.created_resources.volumes) != 1:
             raise ValueError("Task completed but created_resources or volumes is missing or invalid")
@@ -2394,6 +2372,7 @@ class AsyncVolumesResource(AsyncAPIResource):
         region_id: int | None = None,
         snapshots: 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.
@@ -2418,6 +2397,7 @@ class AsyncVolumesResource(AsyncAPIResource):
             task_id=response.tasks[0],
             extra_headers=extra_headers,
             polling_interval_seconds=polling_interval_seconds,
+            polling_timeout_seconds=polling_timeout_seconds,
         )
 
     async def attach_to_instance_and_poll(
@@ -2429,6 +2409,7 @@ class AsyncVolumesResource(AsyncAPIResource):
         instance_id: str,
         attachment_tag: 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.
@@ -2454,6 +2435,7 @@ class AsyncVolumesResource(AsyncAPIResource):
             task_id=response.tasks[0],
             extra_headers=extra_headers,
             polling_interval_seconds=polling_interval_seconds,
+            polling_timeout_seconds=polling_timeout_seconds,
         )
 
     async def detach_from_instance_and_poll(
@@ -2464,6 +2446,7 @@ class AsyncVolumesResource(AsyncAPIResource):
         region_id: int | None = None,
         instance_id: str,
         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.
@@ -2488,6 +2471,7 @@ class AsyncVolumesResource(AsyncAPIResource):
             task_id=response.tasks[0],
             extra_headers=extra_headers,
             polling_interval_seconds=polling_interval_seconds,
+            polling_timeout_seconds=polling_timeout_seconds,
         )
 
     async def resize_and_poll(
@@ -2498,6 +2482,7 @@ class AsyncVolumesResource(AsyncAPIResource):
         region_id: int | None = None,
         size: int,
         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.
@@ -2522,6 +2507,7 @@ class AsyncVolumesResource(AsyncAPIResource):
             task_id=response.tasks[0],
             extra_headers=extra_headers,
             polling_interval_seconds=polling_interval_seconds,
+            polling_timeout_seconds=polling_timeout_seconds,
         )
         return await self.get(
             volume_id=volume_id,

gcore/resources/dns/dns.py

@@ -104,9 +104,7 @@ class DNSResource(SyncAPIResource):
     ) -> DNSGetAccountOverviewResponse:
         """Get info about client"""
         return self._get(
-            "/dns/v2/platform/info"
-            if self._client._base_url_overridden
-            else "https://api.gcore.com//dns/v2/platform/info",
+            "/dns/v2/platform/info",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -143,7 +141,7 @@ class DNSResource(SyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._get(
-            "/dns/v2/lookup" if self._client._base_url_overridden else "https://api.gcore.com//dns/v2/lookup",
+            "/dns/v2/lookup",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -209,9 +207,7 @@ class AsyncDNSResource(AsyncAPIResource):
     ) -> DNSGetAccountOverviewResponse:
         """Get info about client"""
         return await self._get(
-            "/dns/v2/platform/info"
-            if self._client._base_url_overridden
-            else "https://api.gcore.com//dns/v2/platform/info",
+            "/dns/v2/platform/info",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -248,7 +244,7 @@ class AsyncDNSResource(AsyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return await self._get(
-            "/dns/v2/lookup" if self._client._base_url_overridden else "https://api.gcore.com//dns/v2/lookup",
+            "/dns/v2/lookup",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,

gcore/resources/dns/locations.py

@@ -54,7 +54,7 @@ class LocationsResource(SyncAPIResource):
     ) -> LocationListResponse:
         """List of All locations continents/countries/regions."""
         return self._get(
-            "/dns/v2/locations" if self._client._base_url_overridden else "https://api.gcore.com//dns/v2/locations",
+            "/dns/v2/locations",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -73,9 +73,7 @@ class LocationsResource(SyncAPIResource):
     ) -> LocationListContinentsResponse:
         """List of All locations continents."""
         return self._get(
-            "/dns/v2/locations/continents"
-            if self._client._base_url_overridden
-            else "https://api.gcore.com//dns/v2/locations/continents",
+            "/dns/v2/locations/continents",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -94,9 +92,7 @@ class LocationsResource(SyncAPIResource):
     ) -> LocationListCountriesResponse:
         """List of All locations countries."""
         return self._get(
-            "/dns/v2/locations/countries"
-            if self._client._base_url_overridden
-            else "https://api.gcore.com//dns/v2/locations/countries",
+            "/dns/v2/locations/countries",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -115,9 +111,7 @@ class LocationsResource(SyncAPIResource):
     ) -> LocationListRegionsResponse:
         """List of All locations regions."""
         return self._get(
-            "/dns/v2/locations/regions"
-            if self._client._base_url_overridden
-            else "https://api.gcore.com//dns/v2/locations/regions",
+            "/dns/v2/locations/regions",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -157,7 +151,7 @@ class AsyncLocationsResource(AsyncAPIResource):
     ) -> LocationListResponse:
         """List of All locations continents/countries/regions."""
         return await self._get(
-            "/dns/v2/locations" if self._client._base_url_overridden else "https://api.gcore.com//dns/v2/locations",
+            "/dns/v2/locations",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -176,9 +170,7 @@ class AsyncLocationsResource(AsyncAPIResource):
     ) -> LocationListContinentsResponse:
         """List of All locations continents."""
         return await self._get(
-            "/dns/v2/locations/continents"
-            if self._client._base_url_overridden
-            else "https://api.gcore.com//dns/v2/locations/continents",
+            "/dns/v2/locations/continents",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -197,9 +189,7 @@ class AsyncLocationsResource(AsyncAPIResource):
     ) -> LocationListCountriesResponse:
         """List of All locations countries."""
         return await self._get(
-            "/dns/v2/locations/countries"
-            if self._client._base_url_overridden
-            else "https://api.gcore.com//dns/v2/locations/countries",
+            "/dns/v2/locations/countries",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -218,9 +208,7 @@ class AsyncLocationsResource(AsyncAPIResource):
     ) -> LocationListRegionsResponse:
         """List of All locations regions."""
         return await self._get(
-            "/dns/v2/locations/regions"
-            if self._client._base_url_overridden
-            else "https://api.gcore.com//dns/v2/locations/regions",
+            "/dns/v2/locations/regions",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),

gcore/resources/dns/metrics.py

@@ -82,9 +82,7 @@ class MetricsResource(SyncAPIResource):
         """
         extra_headers = {"Accept": "plain/text", **(extra_headers or {})}
         return self._get(
-            "/dns/v2/monitor/metrics"
-            if self._client._base_url_overridden
-            else "https://api.gcore.com//dns/v2/monitor/metrics",
+            "/dns/v2/monitor/metrics",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -162,9 +160,7 @@ class AsyncMetricsResource(AsyncAPIResource):
         """
         extra_headers = {"Accept": "plain/text", **(extra_headers or {})}
         return await self._get(
-            "/dns/v2/monitor/metrics"
-            if self._client._base_url_overridden
-            else "https://api.gcore.com//dns/v2/monitor/metrics",
+            "/dns/v2/monitor/metrics",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,

gcore/resources/dns/pickers/pickers.py

@@ -63,7 +63,7 @@ class PickersResource(SyncAPIResource):
     ) -> PickerListResponse:
         """Returns list of picker"""
         return self._get(
-            "/dns/v2/pickers" if self._client._base_url_overridden else "https://api.gcore.com//dns/v2/pickers",
+            "/dns/v2/pickers",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -107,7 +107,7 @@ class AsyncPickersResource(AsyncAPIResource):
     ) -> PickerListResponse:
         """Returns list of picker"""
         return await self._get(
-            "/dns/v2/pickers" if self._client._base_url_overridden else "https://api.gcore.com//dns/v2/pickers",
+            "/dns/v2/pickers",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),

gcore/resources/dns/pickers/presets.py

@@ -51,9 +51,7 @@ class PresetsResource(SyncAPIResource):
     ) -> PresetListResponse:
         """Returns list of picker preset"""
         return self._get(
-            "/dns/v2/pickers/presets"
-            if self._client._base_url_overridden
-            else "https://api.gcore.com//dns/v2/pickers/presets",
+            "/dns/v2/pickers/presets",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -93,9 +91,7 @@ class AsyncPresetsResource(AsyncAPIResource):
     ) -> PresetListResponse:
         """Returns list of picker preset"""
         return await self._get(
-            "/dns/v2/pickers/presets"
-            if self._client._base_url_overridden
-            else "https://api.gcore.com//dns/v2/pickers/presets",
+            "/dns/v2/pickers/presets",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),