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

gcore/_client.py

@@ -59,6 +59,7 @@ class Gcore(SyncAPIClient):
     cloud_project_id: int | None
     cloud_region_id: int | None
     cloud_polling_interval_seconds: int | None
+    cloud_polling_timeout_seconds: int | None
 
     def __init__(
         self,
@@ -67,6 +68,7 @@ class Gcore(SyncAPIClient):
         cloud_project_id: int | None = None,
         cloud_region_id: int | None = None,
         cloud_polling_interval_seconds: int | None = 3,
+        cloud_polling_timeout_seconds: int | None = 7200,
         base_url: str | httpx.URL | None = None,
         timeout: float | Timeout | None | NotGiven = not_given,
         max_retries: int = DEFAULT_MAX_RETRIES,
@@ -113,9 +115,12 @@ class Gcore(SyncAPIClient):
             cloud_polling_interval_seconds = 3
         self.cloud_polling_interval_seconds = cloud_polling_interval_seconds
 
+        if cloud_polling_timeout_seconds is None:
+            cloud_polling_timeout_seconds = 7200
+        self.cloud_polling_timeout_seconds = cloud_polling_timeout_seconds
+
         if base_url is None:
             base_url = os.environ.get("GCORE_BASE_URL")
-        self._base_url_overridden = base_url is not None
         if base_url is None:
             base_url = f"https://api.gcore.com"
 
@@ -169,6 +174,7 @@ class Gcore(SyncAPIClient):
         cloud_project_id: int | None = None,
         cloud_region_id: int | None = None,
         cloud_polling_interval_seconds: int | None = None,
+        cloud_polling_timeout_seconds: int | None = None,
         base_url: str | httpx.URL | None = None,
         timeout: float | Timeout | None | NotGiven = not_given,
         http_client: httpx.Client | None = None,
@@ -201,11 +207,12 @@ class Gcore(SyncAPIClient):
             params = set_default_query
 
         http_client = http_client or self._client
-        client = self.__class__(
+        return self.__class__(
             api_key=api_key or self.api_key,
             cloud_project_id=cloud_project_id or self.cloud_project_id,
             cloud_region_id=cloud_region_id or self.cloud_region_id,
             cloud_polling_interval_seconds=cloud_polling_interval_seconds or self.cloud_polling_interval_seconds,
+            cloud_polling_timeout_seconds=cloud_polling_timeout_seconds or self.cloud_polling_timeout_seconds,
             base_url=base_url or self.base_url,
             timeout=self.timeout if isinstance(timeout, NotGiven) else timeout,
             http_client=http_client,
@@ -214,8 +221,6 @@ class Gcore(SyncAPIClient):
             default_query=params,
             **_extra_kwargs,
         )
-        client._base_url_overridden = self._base_url_overridden or base_url is not None
-        return client
 
     # Alias for `copy` for nicer inline usage, e.g.
     # client.with_options(timeout=10).foo.create(...)
@@ -291,6 +296,7 @@ class AsyncGcore(AsyncAPIClient):
     cloud_project_id: int | None
     cloud_region_id: int | None
     cloud_polling_interval_seconds: int | None
+    cloud_polling_timeout_seconds: int | None
 
     def __init__(
         self,
@@ -299,6 +305,7 @@ class AsyncGcore(AsyncAPIClient):
         cloud_project_id: int | None = None,
         cloud_region_id: int | None = None,
         cloud_polling_interval_seconds: int | None = 3,
+        cloud_polling_timeout_seconds: int | None = 7200,
         base_url: str | httpx.URL | None = None,
         timeout: float | Timeout | None | NotGiven = not_given,
         max_retries: int = DEFAULT_MAX_RETRIES,
@@ -345,9 +352,12 @@ class AsyncGcore(AsyncAPIClient):
             cloud_polling_interval_seconds = 3
         self.cloud_polling_interval_seconds = cloud_polling_interval_seconds
 
+        if cloud_polling_timeout_seconds is None:
+            cloud_polling_timeout_seconds = 7200
+        self.cloud_polling_timeout_seconds = cloud_polling_timeout_seconds
+
         if base_url is None:
             base_url = os.environ.get("GCORE_BASE_URL")
-        self._base_url_overridden = base_url is not None
         if base_url is None:
             base_url = f"https://api.gcore.com"
 
@@ -401,6 +411,7 @@ class AsyncGcore(AsyncAPIClient):
         cloud_project_id: int | None = None,
         cloud_region_id: int | None = None,
         cloud_polling_interval_seconds: int | None = None,
+        cloud_polling_timeout_seconds: int | None = None,
         base_url: str | httpx.URL | None = None,
         timeout: float | Timeout | None | NotGiven = not_given,
         http_client: httpx.AsyncClient | None = None,
@@ -433,11 +444,12 @@ class AsyncGcore(AsyncAPIClient):
             params = set_default_query
 
         http_client = http_client or self._client
-        client = self.__class__(
+        return self.__class__(
             api_key=api_key or self.api_key,
             cloud_project_id=cloud_project_id or self.cloud_project_id,
             cloud_region_id=cloud_region_id or self.cloud_region_id,
             cloud_polling_interval_seconds=cloud_polling_interval_seconds or self.cloud_polling_interval_seconds,
+            cloud_polling_timeout_seconds=cloud_polling_timeout_seconds or self.cloud_polling_timeout_seconds,
             base_url=base_url or self.base_url,
             timeout=self.timeout if isinstance(timeout, NotGiven) else timeout,
             http_client=http_client,
@@ -446,8 +458,6 @@ class AsyncGcore(AsyncAPIClient):
             default_query=params,
             **_extra_kwargs,
         )
-        client._base_url_overridden = self._base_url_overridden or base_url is not None
-        return client
 
     # Alias for `copy` for nicer inline usage, e.g.
     # client.with_options(timeout=10).foo.create(...)

gcore/_version.py

@@ -1,4 +1,4 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 __title__ = "gcore"
-__version__ = "0.15.0"  # x-release-please-version
+__version__ = "0.17.0"  # x-release-please-version

gcore/resources/cdn/audit_log.py

@@ -125,9 +125,7 @@ class AuditLogResource(SyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._get_api_list(
-            "/cdn/activity_log/requests"
-            if self._client._base_url_overridden
-            else "https://api.gcore.com//cdn/activity_log/requests",
+            "/cdn/activity_log/requests",
             page=SyncOffsetPage[CdnAuditLogEntry],
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -180,9 +178,7 @@ class AuditLogResource(SyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._get(
-            f"/cdn/activity_log/requests/{log_id}"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cdn/activity_log/requests/{log_id}",
+            f"/cdn/activity_log/requests/{log_id}",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -293,9 +289,7 @@ class AsyncAuditLogResource(AsyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._get_api_list(
-            "/cdn/activity_log/requests"
-            if self._client._base_url_overridden
-            else "https://api.gcore.com//cdn/activity_log/requests",
+            "/cdn/activity_log/requests",
             page=AsyncOffsetPage[CdnAuditLogEntry],
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -348,9 +342,7 @@ class AsyncAuditLogResource(AsyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return await self._get(
-            f"/cdn/activity_log/requests/{log_id}"
-            if self._client._base_url_overridden
-            else f"https://api.gcore.com//cdn/activity_log/requests/{log_id}",
+            f"/cdn/activity_log/requests/{log_id}",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),

gcore/resources/cdn/cdn.py

@@ -4,6 +4,14 @@ from __future__ import annotations
 
 import httpx
 
+from .logs import (
+    LogsResource,
+    AsyncLogsResource,
+    LogsResourceWithRawResponse,
+    AsyncLogsResourceWithRawResponse,
+    LogsResourceWithStreamingResponse,
+    AsyncLogsResourceWithStreamingResponse,
+)
 from .metrics import (
     MetricsResource,
     AsyncMetricsResource,
@@ -39,14 +47,6 @@ from .ip_ranges import (
     IPRangesResourceWithStreamingResponse,
     AsyncIPRangesResourceWithStreamingResponse,
 )
-from .logs.logs import (
-    LogsResource,
-    AsyncLogsResource,
-    LogsResourceWithRawResponse,
-    AsyncLogsResourceWithRawResponse,
-    LogsResourceWithStreamingResponse,
-    AsyncLogsResourceWithStreamingResponse,
-)
 from .statistics import (
     StatisticsResource,
     AsyncStatisticsResource,
@@ -63,7 +63,6 @@ from ..._response import (
     async_to_streamed_response_wrapper,
 )
 from ...types.cdn import cdn_update_account_params, cdn_list_purge_statuses_params
-from ...pagination import SyncOffsetPageCdn, AsyncOffsetPageCdn
 from .certificates import (
     CertificatesResource,
     AsyncCertificatesResource,
@@ -80,7 +79,7 @@ from .origin_groups import (
     OriginGroupsResourceWithStreamingResponse,
     AsyncOriginGroupsResourceWithStreamingResponse,
 )
-from ..._base_client import AsyncPaginator, make_request_options
+from ..._base_client import make_request_options
 from .rule_templates import (
     RuleTemplatesResource,
     AsyncRuleTemplatesResource,
@@ -105,6 +104,7 @@ from .resources.resources import (
     ResourcesResourceWithStreamingResponse,
     AsyncResourcesResourceWithStreamingResponse,
 )
+from ...types.cdn.aws_regions import AwsRegions
 from ...types.cdn.cdn_account import CdnAccount
 from .trusted_ca_certificates import (
     TrustedCaCertificatesResource,
@@ -114,7 +114,7 @@ from .trusted_ca_certificates import (
     TrustedCaCertificatesResourceWithStreamingResponse,
     AsyncTrustedCaCertificatesResourceWithStreamingResponse,
 )
-from ...types.cdn.purge_status import PurgeStatus
+from ...types.cdn.alibaba_regions import AlibabaRegions
 from .logs_uploader.logs_uploader import (
     LogsUploaderResource,
     AsyncLogsUploaderResource,
@@ -125,6 +125,7 @@ from .logs_uploader.logs_uploader import (
 )
 from ...types.cdn.cdn_account_limits import CdnAccountLimits
 from ...types.cdn.cdn_available_features import CdnAvailableFeatures
+from ...types.cdn.cdn_list_purge_statuses_response import CdnListPurgeStatusesResponse
 
 __all__ = ["CdnResource", "AsyncCdnResource"]
 
@@ -213,9 +214,7 @@ class CdnResource(SyncAPIResource):
     ) -> CdnAccountLimits:
         """Get information about CDN service limits."""
         return self._get(
-            "/cdn/clients/me/limits"
-            if self._client._base_url_overridden
-            else "https://api.gcore.com//cdn/clients/me/limits",
+            "/cdn/clients/me/limits",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -234,7 +233,7 @@ class CdnResource(SyncAPIResource):
     ) -> CdnAccount:
         """Get information about CDN service."""
         return self._get(
-            "/cdn/clients/me" if self._client._base_url_overridden else "https://api.gcore.com//cdn/clients/me",
+            "/cdn/clients/me",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -253,15 +252,51 @@ class CdnResource(SyncAPIResource):
     ) -> CdnAvailableFeatures:
         """Get information about available CDN features."""
         return self._get(
-            "/cdn/clients/me/features"
-            if self._client._base_url_overridden
-            else "https://api.gcore.com//cdn/clients/me/features",
+            "/cdn/clients/me/features",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
             cast_to=CdnAvailableFeatures,
         )
 
+    def list_alibaba_regions(
+        self,
+        *,
+        # 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,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AlibabaRegions:
+        """Get the list of Alibaba Cloud regions."""
+        return self._get(
+            "/cdn/alibaba_regions",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=AlibabaRegions,
+        )
+
+    def list_aws_regions(
+        self,
+        *,
+        # 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,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AwsRegions:
+        """Get the list of Amazon AWS regions."""
+        return self._get(
+            "/cdn/aws_regions",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=AwsRegions,
+        )
+
     def list_purge_statuses(
         self,
         *,
@@ -278,7 +313,7 @@ class CdnResource(SyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = not_given,
-    ) -> SyncOffsetPageCdn[PurgeStatus]:
+    ) -> CdnListPurgeStatusesResponse:
         """
         Get purges history.
 
@@ -334,9 +369,8 @@ class CdnResource(SyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return self._get_api_list(
-            "/cdn/purge_statuses" if self._client._base_url_overridden else "https://api.gcore.com//cdn/purge_statuses",
-            page=SyncOffsetPageCdn[PurgeStatus],
+        return self._get(
+            "/cdn/purge_statuses",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -355,7 +389,7 @@ class CdnResource(SyncAPIResource):
                     cdn_list_purge_statuses_params.CdnListPurgeStatusesParams,
                 ),
             ),
-            model=PurgeStatus,
+            cast_to=CdnListPurgeStatusesResponse,
         )
 
     def update_account(
@@ -386,7 +420,7 @@ class CdnResource(SyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._patch(
-            "/cdn/clients/me" if self._client._base_url_overridden else "https://api.gcore.com//cdn/clients/me",
+            "/cdn/clients/me",
             body=maybe_transform(
                 {"utilization_level": utilization_level}, cdn_update_account_params.CdnUpdateAccountParams
             ),
@@ -481,9 +515,7 @@ class AsyncCdnResource(AsyncAPIResource):
     ) -> CdnAccountLimits:
         """Get information about CDN service limits."""
         return await self._get(
-            "/cdn/clients/me/limits"
-            if self._client._base_url_overridden
-            else "https://api.gcore.com//cdn/clients/me/limits",
+            "/cdn/clients/me/limits",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -502,7 +534,7 @@ class AsyncCdnResource(AsyncAPIResource):
     ) -> CdnAccount:
         """Get information about CDN service."""
         return await self._get(
-            "/cdn/clients/me" if self._client._base_url_overridden else "https://api.gcore.com//cdn/clients/me",
+            "/cdn/clients/me",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -521,16 +553,52 @@ class AsyncCdnResource(AsyncAPIResource):
     ) -> CdnAvailableFeatures:
         """Get information about available CDN features."""
         return await self._get(
-            "/cdn/clients/me/features"
-            if self._client._base_url_overridden
-            else "https://api.gcore.com//cdn/clients/me/features",
+            "/cdn/clients/me/features",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
             cast_to=CdnAvailableFeatures,
         )
 
-    def list_purge_statuses(
+    async def list_alibaba_regions(
+        self,
+        *,
+        # 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,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AlibabaRegions:
+        """Get the list of Alibaba Cloud regions."""
+        return await self._get(
+            "/cdn/alibaba_regions",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=AlibabaRegions,
+        )
+
+    async def list_aws_regions(
+        self,
+        *,
+        # 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,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> AwsRegions:
+        """Get the list of Amazon AWS regions."""
+        return await self._get(
+            "/cdn/aws_regions",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=AwsRegions,
+        )
+
+    async def list_purge_statuses(
         self,
         *,
         cname: str | Omit = omit,
@@ -546,7 +614,7 @@ class AsyncCdnResource(AsyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = not_given,
-    ) -> AsyncPaginator[PurgeStatus, AsyncOffsetPageCdn[PurgeStatus]]:
+    ) -> CdnListPurgeStatusesResponse:
         """
         Get purges history.
 
@@ -602,15 +670,14 @@ class AsyncCdnResource(AsyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return self._get_api_list(
-            "/cdn/purge_statuses" if self._client._base_url_overridden else "https://api.gcore.com//cdn/purge_statuses",
-            page=AsyncOffsetPageCdn[PurgeStatus],
+        return await self._get(
+            "/cdn/purge_statuses",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                query=maybe_transform(
+                query=await async_maybe_transform(
                     {
                         "cname": cname,
                         "from_created": from_created,
@@ -623,7 +690,7 @@ class AsyncCdnResource(AsyncAPIResource):
                     cdn_list_purge_statuses_params.CdnListPurgeStatusesParams,
                 ),
             ),
-            model=PurgeStatus,
+            cast_to=CdnListPurgeStatusesResponse,
         )
 
     async def update_account(
@@ -654,7 +721,7 @@ class AsyncCdnResource(AsyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return await self._patch(
-            "/cdn/clients/me" if self._client._base_url_overridden else "https://api.gcore.com//cdn/clients/me",
+            "/cdn/clients/me",
             body=await async_maybe_transform(
                 {"utilization_level": utilization_level}, cdn_update_account_params.CdnUpdateAccountParams
             ),
@@ -678,6 +745,12 @@ class CdnResourceWithRawResponse:
         self.get_available_features = to_raw_response_wrapper(
             cdn.get_available_features,
         )
+        self.list_alibaba_regions = to_raw_response_wrapper(
+            cdn.list_alibaba_regions,
+        )
+        self.list_aws_regions = to_raw_response_wrapper(
+            cdn.list_aws_regions,
+        )
         self.list_purge_statuses = to_raw_response_wrapper(
             cdn.list_purge_statuses,
         )
@@ -751,6 +824,12 @@ class AsyncCdnResourceWithRawResponse:
         self.get_available_features = async_to_raw_response_wrapper(
             cdn.get_available_features,
         )
+        self.list_alibaba_regions = async_to_raw_response_wrapper(
+            cdn.list_alibaba_regions,
+        )
+        self.list_aws_regions = async_to_raw_response_wrapper(
+            cdn.list_aws_regions,
+        )
         self.list_purge_statuses = async_to_raw_response_wrapper(
             cdn.list_purge_statuses,
         )
@@ -824,6 +903,12 @@ class CdnResourceWithStreamingResponse:
         self.get_available_features = to_streamed_response_wrapper(
             cdn.get_available_features,
         )
+        self.list_alibaba_regions = to_streamed_response_wrapper(
+            cdn.list_alibaba_regions,
+        )
+        self.list_aws_regions = to_streamed_response_wrapper(
+            cdn.list_aws_regions,
+        )
         self.list_purge_statuses = to_streamed_response_wrapper(
             cdn.list_purge_statuses,
         )
@@ -897,6 +982,12 @@ class AsyncCdnResourceWithStreamingResponse:
         self.get_available_features = async_to_streamed_response_wrapper(
             cdn.get_available_features,
         )
+        self.list_alibaba_regions = async_to_streamed_response_wrapper(
+            cdn.list_alibaba_regions,
+        )
+        self.list_aws_regions = async_to_streamed_response_wrapper(
+            cdn.list_aws_regions,
+        )
         self.list_purge_statuses = async_to_streamed_response_wrapper(
             cdn.list_purge_statuses,
         )