gcore 0.12.0__py3-none-any.whl → 0.14.0__py3-none-any.whl

gcore/resources/waap/ip_info/ip_info.py

@@ -12,7 +12,7 @@ from .metrics import (
     MetricsResourceWithStreamingResponse,
     AsyncMetricsResourceWithStreamingResponse,
 )
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Query, Headers, NotGiven, not_given
 from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
@@ -33,8 +33,8 @@ from ....types.waap import (
     ip_info_list_attacked_countries_params,
 )
 from ...._base_client import make_request_options
+from ....types.waap.waap_ip_info import WaapIPInfo
 from ....types.waap.waap_ip_ddos_info_model import WaapIPDDOSInfoModel
-from ....types.waap.ip_info_get_ip_info_response import IPInfoGetIPInfoResponse
 from ....types.waap.ip_info_get_top_urls_response import IPInfoGetTopURLsResponse
 from ....types.waap.ip_info_get_top_user_agents_response import IPInfoGetTopUserAgentsResponse
 from ....types.waap.ip_info_get_blocked_requests_response import IPInfoGetBlockedRequestsResponse
@@ -78,7 +78,7 @@ class IPInfoResource(SyncAPIResource):
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPInfoGetAttackTimeSeriesResponse:
         """
         Retrieve a time-series of attacks originating from a specified IP address.
@@ -95,7 +95,9 @@ class IPInfoResource(SyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._get(
-            "/waap/v1/ip-info/attack-time-series",
+            "/waap/v1/ip-info/attack-time-series"
+            if self._client._base_url_overridden
+            else "https://api.gcore.com//waap/v1/ip-info/attack-time-series",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -118,7 +120,7 @@ class IPInfoResource(SyncAPIResource):
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPInfoGetBlockedRequestsResponse:
         """
         Retrieve metrics, which enumerate blocked requests originating from a specific
@@ -142,7 +144,9 @@ class IPInfoResource(SyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._get(
-            "/waap/v1/ip-info/blocked-requests",
+            "/waap/v1/ip-info/blocked-requests"
+            if self._client._base_url_overridden
+            else "https://api.gcore.com//waap/v1/ip-info/blocked-requests",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -168,7 +172,7 @@ class IPInfoResource(SyncAPIResource):
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> WaapIPDDOSInfoModel:
         """
         Fetch and analyze DDoS (Distributed Denial of Service) attack metrics for a
@@ -189,7 +193,9 @@ class IPInfoResource(SyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._get(
-            "/waap/v1/ip-info/ddos",
+            "/waap/v1/ip-info/ddos"
+            if self._client._base_url_overridden
+            else "https://api.gcore.com//waap/v1/ip-info/ddos",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -211,8 +217,8 @@ class IPInfoResource(SyncAPIResource):
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> IPInfoGetIPInfoResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WaapIPInfo:
         """
         Fetch details about a particular IP address, including WHOIS data, risk score,
         and additional tags.
@@ -229,7 +235,9 @@ class IPInfoResource(SyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._get(
-            "/waap/v1/ip-info/ip-info",
+            "/waap/v1/ip-info/ip-info"
+            if self._client._base_url_overridden
+            else "https://api.gcore.com//waap/v1/ip-info/ip-info",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -237,7 +245,7 @@ class IPInfoResource(SyncAPIResource):
                 timeout=timeout,
                 query=maybe_transform({"ip": ip}, ip_info_get_ip_info_params.IPInfoGetIPInfoParams),
             ),
-            cast_to=IPInfoGetIPInfoResponse,
+            cast_to=WaapIPInfo,
         )
 
     def get_top_urls(
@@ -250,7 +258,7 @@ class IPInfoResource(SyncAPIResource):
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPInfoGetTopURLsResponse:
         """
         Returns a list of the top 10 URLs accessed by a specified IP address within a
@@ -274,7 +282,9 @@ class IPInfoResource(SyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._get(
-            "/waap/v1/ip-info/top-urls",
+            "/waap/v1/ip-info/top-urls"
+            if self._client._base_url_overridden
+            else "https://api.gcore.com//waap/v1/ip-info/top-urls",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -301,7 +311,7 @@ class IPInfoResource(SyncAPIResource):
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPInfoGetTopUserAgentsResponse:
         """
         Retrieve the top 10 user agents interacting with a specified domain, filtered by
@@ -323,7 +333,9 @@ class IPInfoResource(SyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._get(
-            "/waap/v1/ip-info/top-user-agents",
+            "/waap/v1/ip-info/top-user-agents"
+            if self._client._base_url_overridden
+            else "https://api.gcore.com//waap/v1/ip-info/top-user-agents",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -350,7 +362,7 @@ class IPInfoResource(SyncAPIResource):
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPInfoGetTopUserSessionsResponse:
         """
         Obtain the top 10 user sessions interfacing with a particular domain, identified
@@ -372,7 +384,9 @@ class IPInfoResource(SyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._get(
-            "/waap/v1/ip-info/top-sessions",
+            "/waap/v1/ip-info/top-sessions"
+            if self._client._base_url_overridden
+            else "https://api.gcore.com//waap/v1/ip-info/top-sessions",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -398,7 +412,7 @@ class IPInfoResource(SyncAPIResource):
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPInfoListAttackedCountriesResponse:
         """
         Retrieve a list of countries attacked by the specified IP address
@@ -415,7 +429,9 @@ class IPInfoResource(SyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._get(
-            "/waap/v1/ip-info/attack-map",
+            "/waap/v1/ip-info/attack-map"
+            if self._client._base_url_overridden
+            else "https://api.gcore.com//waap/v1/ip-info/attack-map",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -462,7 +478,7 @@ class AsyncIPInfoResource(AsyncAPIResource):
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPInfoGetAttackTimeSeriesResponse:
         """
         Retrieve a time-series of attacks originating from a specified IP address.
@@ -479,7 +495,9 @@ class AsyncIPInfoResource(AsyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return await self._get(
-            "/waap/v1/ip-info/attack-time-series",
+            "/waap/v1/ip-info/attack-time-series"
+            if self._client._base_url_overridden
+            else "https://api.gcore.com//waap/v1/ip-info/attack-time-series",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -502,7 +520,7 @@ class AsyncIPInfoResource(AsyncAPIResource):
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPInfoGetBlockedRequestsResponse:
         """
         Retrieve metrics, which enumerate blocked requests originating from a specific
@@ -526,7 +544,9 @@ class AsyncIPInfoResource(AsyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return await self._get(
-            "/waap/v1/ip-info/blocked-requests",
+            "/waap/v1/ip-info/blocked-requests"
+            if self._client._base_url_overridden
+            else "https://api.gcore.com//waap/v1/ip-info/blocked-requests",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -552,7 +572,7 @@ class AsyncIPInfoResource(AsyncAPIResource):
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> WaapIPDDOSInfoModel:
         """
         Fetch and analyze DDoS (Distributed Denial of Service) attack metrics for a
@@ -573,7 +593,9 @@ class AsyncIPInfoResource(AsyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return await self._get(
-            "/waap/v1/ip-info/ddos",
+            "/waap/v1/ip-info/ddos"
+            if self._client._base_url_overridden
+            else "https://api.gcore.com//waap/v1/ip-info/ddos",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -595,8 +617,8 @@ class AsyncIPInfoResource(AsyncAPIResource):
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> IPInfoGetIPInfoResponse:
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> WaapIPInfo:
         """
         Fetch details about a particular IP address, including WHOIS data, risk score,
         and additional tags.
@@ -613,7 +635,9 @@ class AsyncIPInfoResource(AsyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return await self._get(
-            "/waap/v1/ip-info/ip-info",
+            "/waap/v1/ip-info/ip-info"
+            if self._client._base_url_overridden
+            else "https://api.gcore.com//waap/v1/ip-info/ip-info",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -621,7 +645,7 @@ class AsyncIPInfoResource(AsyncAPIResource):
                 timeout=timeout,
                 query=await async_maybe_transform({"ip": ip}, ip_info_get_ip_info_params.IPInfoGetIPInfoParams),
             ),
-            cast_to=IPInfoGetIPInfoResponse,
+            cast_to=WaapIPInfo,
         )
 
     async def get_top_urls(
@@ -634,7 +658,7 @@ class AsyncIPInfoResource(AsyncAPIResource):
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPInfoGetTopURLsResponse:
         """
         Returns a list of the top 10 URLs accessed by a specified IP address within a
@@ -658,7 +682,9 @@ class AsyncIPInfoResource(AsyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return await self._get(
-            "/waap/v1/ip-info/top-urls",
+            "/waap/v1/ip-info/top-urls"
+            if self._client._base_url_overridden
+            else "https://api.gcore.com//waap/v1/ip-info/top-urls",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -685,7 +711,7 @@ class AsyncIPInfoResource(AsyncAPIResource):
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPInfoGetTopUserAgentsResponse:
         """
         Retrieve the top 10 user agents interacting with a specified domain, filtered by
@@ -707,7 +733,9 @@ class AsyncIPInfoResource(AsyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return await self._get(
-            "/waap/v1/ip-info/top-user-agents",
+            "/waap/v1/ip-info/top-user-agents"
+            if self._client._base_url_overridden
+            else "https://api.gcore.com//waap/v1/ip-info/top-user-agents",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -734,7 +762,7 @@ class AsyncIPInfoResource(AsyncAPIResource):
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPInfoGetTopUserSessionsResponse:
         """
         Obtain the top 10 user sessions interfacing with a particular domain, identified
@@ -756,7 +784,9 @@ class AsyncIPInfoResource(AsyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return await self._get(
-            "/waap/v1/ip-info/top-sessions",
+            "/waap/v1/ip-info/top-sessions"
+            if self._client._base_url_overridden
+            else "https://api.gcore.com//waap/v1/ip-info/top-sessions",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -782,7 +812,7 @@ class AsyncIPInfoResource(AsyncAPIResource):
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> IPInfoListAttackedCountriesResponse:
         """
         Retrieve a list of countries attacked by the specified IP address
@@ -799,7 +829,9 @@ class AsyncIPInfoResource(AsyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return await self._get(
-            "/waap/v1/ip-info/attack-map",
+            "/waap/v1/ip-info/attack-map"
+            if self._client._base_url_overridden
+            else "https://api.gcore.com//waap/v1/ip-info/attack-map",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,

gcore/resources/waap/ip_info/metrics.py

@@ -6,7 +6,7 @@ from typing import Optional
 
 import httpx
 
-from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
 from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
@@ -47,13 +47,13 @@ class MetricsResource(SyncAPIResource):
         self,
         *,
         ip: str,
-        domain_id: Optional[int] | NotGiven = NOT_GIVEN,
+        domain_id: Optional[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,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> WaapIPInfoCounts:
         """
         Retrieve metrics encompassing the counts of total requests, blocked requests and
@@ -77,7 +77,9 @@ class MetricsResource(SyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._get(
-            "/waap/v1/ip-info/counts",
+            "/waap/v1/ip-info/counts"
+            if self._client._base_url_overridden
+            else "https://api.gcore.com//waap/v1/ip-info/counts",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -119,13 +121,13 @@ class AsyncMetricsResource(AsyncAPIResource):
         self,
         *,
         ip: str,
-        domain_id: Optional[int] | NotGiven = NOT_GIVEN,
+        domain_id: Optional[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,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> WaapIPInfoCounts:
         """
         Retrieve metrics encompassing the counts of total requests, blocked requests and
@@ -149,7 +151,9 @@ class AsyncMetricsResource(AsyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return await self._get(
-            "/waap/v1/ip-info/counts",
+            "/waap/v1/ip-info/counts"
+            if self._client._base_url_overridden
+            else "https://api.gcore.com//waap/v1/ip-info/counts",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,

gcore/resources/waap/organizations.py

@@ -7,7 +7,7 @@ from typing_extensions import Literal
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
 from ..._utils import maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
@@ -48,16 +48,16 @@ class OrganizationsResource(SyncAPIResource):
     def list(
         self,
         *,
-        limit: int | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        offset: int | NotGiven = NOT_GIVEN,
-        ordering: Optional[Literal["name", "id", "-name", "-id"]] | NotGiven = NOT_GIVEN,
+        limit: int | Omit = omit,
+        name: str | Omit = omit,
+        offset: int | Omit = omit,
+        ordering: Optional[Literal["name", "id", "-name", "-id"]] | 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,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncOffsetPage[WaapOrganization]:
         """
         This endpoint retrieves a list of network organizations that own IP ranges as
@@ -82,7 +82,9 @@ class OrganizationsResource(SyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._get_api_list(
-            "/waap/v1/organizations",
+            "/waap/v1/organizations"
+            if self._client._base_url_overridden
+            else "https://api.gcore.com//waap/v1/organizations",
             page=SyncOffsetPage[WaapOrganization],
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -126,16 +128,16 @@ class AsyncOrganizationsResource(AsyncAPIResource):
     def list(
         self,
         *,
-        limit: int | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        offset: int | NotGiven = NOT_GIVEN,
-        ordering: Optional[Literal["name", "id", "-name", "-id"]] | NotGiven = NOT_GIVEN,
+        limit: int | Omit = omit,
+        name: str | Omit = omit,
+        offset: int | Omit = omit,
+        ordering: Optional[Literal["name", "id", "-name", "-id"]] | 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,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[WaapOrganization, AsyncOffsetPage[WaapOrganization]]:
         """
         This endpoint retrieves a list of network organizations that own IP ranges as
@@ -160,7 +162,9 @@ class AsyncOrganizationsResource(AsyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._get_api_list(
-            "/waap/v1/organizations",
+            "/waap/v1/organizations"
+            if self._client._base_url_overridden
+            else "https://api.gcore.com//waap/v1/organizations",
             page=AsyncOffsetPage[WaapOrganization],
             options=make_request_options(
                 extra_headers=extra_headers,

gcore/resources/waap/statistics.py

@@ -8,7 +8,7 @@ from typing_extensions import Literal
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ..._types import Body, Query, Headers, NotGiven, not_given
 from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
@@ -57,7 +57,7 @@ class StatisticsResource(SyncAPIResource):
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> WaapStatisticsSeries:
         """Retrieve statistics data as a time series.
 
@@ -87,7 +87,9 @@ class StatisticsResource(SyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._get(
-            "/waap/v1/statistics/series",
+            "/waap/v1/statistics/series"
+            if self._client._base_url_overridden
+            else "https://api.gcore.com//waap/v1/statistics/series",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -139,7 +141,7 @@ class AsyncStatisticsResource(AsyncAPIResource):
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> WaapStatisticsSeries:
         """Retrieve statistics data as a time series.
 
@@ -169,7 +171,9 @@ class AsyncStatisticsResource(AsyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return await self._get(
-            "/waap/v1/statistics/series",
+            "/waap/v1/statistics/series"
+            if self._client._base_url_overridden
+            else "https://api.gcore.com//waap/v1/statistics/series",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,

gcore/resources/waap/tags.py

@@ -7,7 +7,7 @@ from typing_extensions import Literal
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
 from ..._utils import maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
@@ -48,19 +48,19 @@ class TagsResource(SyncAPIResource):
     def list(
         self,
         *,
-        limit: int | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        offset: int | NotGiven = NOT_GIVEN,
+        limit: int | Omit = omit,
+        name: str | Omit = omit,
+        offset: int | Omit = omit,
         ordering: Optional[Literal["name", "readable_name", "reserved", "-name", "-readable_name", "-reserved"]]
-        | NotGiven = NOT_GIVEN,
-        readable_name: str | NotGiven = NOT_GIVEN,
-        reserved: bool | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        readable_name: str | Omit = omit,
+        reserved: bool | 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,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> SyncOffsetPage[WaapTag]:
         """
         Tags are shortcuts for the rules used in WAAP policies for the creation of more
@@ -88,7 +88,7 @@ class TagsResource(SyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._get_api_list(
-            "/waap/v1/tags",
+            "/waap/v1/tags" if self._client._base_url_overridden else "https://api.gcore.com//waap/v1/tags",
             page=SyncOffsetPage[WaapTag],
             options=make_request_options(
                 extra_headers=extra_headers,
@@ -134,19 +134,19 @@ class AsyncTagsResource(AsyncAPIResource):
     def list(
         self,
         *,
-        limit: int | NotGiven = NOT_GIVEN,
-        name: str | NotGiven = NOT_GIVEN,
-        offset: int | NotGiven = NOT_GIVEN,
+        limit: int | Omit = omit,
+        name: str | Omit = omit,
+        offset: int | Omit = omit,
         ordering: Optional[Literal["name", "readable_name", "reserved", "-name", "-readable_name", "-reserved"]]
-        | NotGiven = NOT_GIVEN,
-        readable_name: str | NotGiven = NOT_GIVEN,
-        reserved: bool | NotGiven = NOT_GIVEN,
+        | Omit = omit,
+        readable_name: str | Omit = omit,
+        reserved: bool | 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,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> AsyncPaginator[WaapTag, AsyncOffsetPage[WaapTag]]:
         """
         Tags are shortcuts for the rules used in WAAP policies for the creation of more
@@ -174,7 +174,7 @@ class AsyncTagsResource(AsyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         return self._get_api_list(
-            "/waap/v1/tags",
+            "/waap/v1/tags" if self._client._base_url_overridden else "https://api.gcore.com//waap/v1/tags",
             page=AsyncOffsetPage[WaapTag],
             options=make_request_options(
                 extra_headers=extra_headers,

gcore/resources/waap/waap.py

@@ -12,7 +12,7 @@ from .tags import (
     TagsResourceWithStreamingResponse,
     AsyncTagsResourceWithStreamingResponse,
 )
-from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ..._types import Body, Query, Headers, NotGiven, not_given
 from .insights import (
     InsightsResource,
     AsyncInsightsResource,
@@ -143,11 +143,11 @@ class WaapResource(SyncAPIResource):
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> WaapGetAccountOverviewResponse:
         """Get information about WAAP service for the client"""
         return self._get(
-            "/waap/v1/clients/me",
+            "/waap/v1/clients/me" if self._client._base_url_overridden else "https://api.gcore.com//waap/v1/clients/me",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -215,11 +215,11 @@ class AsyncWaapResource(AsyncAPIResource):
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> WaapGetAccountOverviewResponse:
         """Get information about WAAP service for the client"""
         return await self._get(
-            "/waap/v1/clients/me",
+            "/waap/v1/clients/me" if self._client._base_url_overridden else "https://api.gcore.com//waap/v1/clients/me",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),