From 4f69e7e5aa778cf82357d7d097e874100bfa9e0d Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Thu, 11 Sep 2025 10:19:23 +0000 Subject: [PATCH 01/16] fix(waap)!: model references --- .stats.yml | 2 +- api.md | 5 +++-- src/gcore/resources/waap/ip_info/ip_info.py | 10 +++++----- src/gcore/types/waap/__init__.py | 3 ++- .../types/waap/ip_info_get_top_urls_response.py | 15 +++------------ ...fo_get_ip_info_response.py => waap_ip_info.py} | 4 ++-- src/gcore/types/waap/waap_top_url.py | 13 +++++++++++++ tests/api_resources/waap/test_ip_info.py | 14 +++++++------- 8 files changed, 36 insertions(+), 30 deletions(-) rename src/gcore/types/waap/{ip_info_get_ip_info_response.py => waap_ip_info.py} (93%) create mode 100644 src/gcore/types/waap/waap_top_url.py diff --git a/.stats.yml b/.stats.yml index bf75ef97..6b134832 100644 --- a/.stats.yml +++ b/.stats.yml @@ -1,4 +1,4 @@ configured_endpoints: 523 openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/gcore%2Fgcore-fa5e3eb5c4c01c6be5a8d036640779fa59a1931c596245748ed28601213caa3b.yml openapi_spec_hash: 2ad55753d983df577077b3ce156ac4ca -config_hash: 94a708396796faa210065e6aa3afebc2 +config_hash: 48160a994660f9410c8552e51274bef9 diff --git a/api.md b/api.md index 7a3fa350..813dbe4c 100644 --- a/api.md +++ b/api.md @@ -1289,13 +1289,14 @@ Types: from gcore.types.waap import ( WaapIPCountryAttack, WaapIPDDOSInfoModel, + WaapIPInfo, WaapRuleBlockedRequests, WaapTimeSeriesAttack, WaapTopSession, + WaapTopURL, WaapTopUserAgent, IPInfoGetAttackTimeSeriesResponse, IPInfoGetBlockedRequestsResponse, - IPInfoGetIPInfoResponse, IPInfoGetTopURLsResponse, IPInfoGetTopUserAgentsResponse, IPInfoGetTopUserSessionsResponse, @@ -1308,7 +1309,7 @@ Methods: - client.waap.ip_info.get_attack_time_series(\*\*params) -> IPInfoGetAttackTimeSeriesResponse - client.waap.ip_info.get_blocked_requests(\*\*params) -> IPInfoGetBlockedRequestsResponse - client.waap.ip_info.get_ddos_attack_series(\*\*params) -> WaapIPDDOSInfoModel -- client.waap.ip_info.get_ip_info(\*\*params) -> IPInfoGetIPInfoResponse +- client.waap.ip_info.get_ip_info(\*\*params) -> WaapIPInfo - client.waap.ip_info.get_top_urls(\*\*params) -> IPInfoGetTopURLsResponse - client.waap.ip_info.get_top_user_agents(\*\*params) -> IPInfoGetTopUserAgentsResponse - client.waap.ip_info.get_top_user_sessions(\*\*params) -> IPInfoGetTopUserSessionsResponse diff --git a/src/gcore/resources/waap/ip_info/ip_info.py b/src/gcore/resources/waap/ip_info/ip_info.py index 7d4d5f1b..e721bf7d 100644 --- a/src/gcore/resources/waap/ip_info/ip_info.py +++ b/src/gcore/resources/waap/ip_info/ip_info.py @@ -33,8 +33,8 @@ 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 @@ -212,7 +212,7 @@ def get_ip_info( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> IPInfoGetIPInfoResponse: + ) -> WaapIPInfo: """ Fetch details about a particular IP address, including WHOIS data, risk score, and additional tags. @@ -237,7 +237,7 @@ def get_ip_info( timeout=timeout, query=maybe_transform({"ip": ip}, ip_info_get_ip_info_params.IPInfoGetIPInfoParams), ), - cast_to=IPInfoGetIPInfoResponse, + cast_to=WaapIPInfo, ) def get_top_urls( @@ -596,7 +596,7 @@ async def get_ip_info( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> IPInfoGetIPInfoResponse: + ) -> WaapIPInfo: """ Fetch details about a particular IP address, including WHOIS data, risk score, and additional tags. @@ -621,7 +621,7 @@ async def get_ip_info( 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( diff --git a/src/gcore/types/waap/__init__.py b/src/gcore/types/waap/__init__.py index 29b9b772..b90f2d8b 100644 --- a/src/gcore/types/waap/__init__.py +++ b/src/gcore/types/waap/__init__.py @@ -3,6 +3,8 @@ from __future__ import annotations from .waap_tag import WaapTag as WaapTag +from .waap_ip_info import WaapIPInfo as WaapIPInfo +from .waap_top_url import WaapTopURL as WaapTopURL from .waap_rule_set import WaapRuleSet as WaapRuleSet from .tag_list_params import TagListParams as TagListParams from .waap_policy_mode import WaapPolicyMode as WaapPolicyMode @@ -30,7 +32,6 @@ from .waap_rule_blocked_requests import WaapRuleBlockedRequests as WaapRuleBlockedRequests from .custom_page_set_list_params import CustomPageSetListParams as CustomPageSetListParams from .ip_info_get_top_urls_params import IPInfoGetTopURLsParams as IPInfoGetTopURLsParams -from .ip_info_get_ip_info_response import IPInfoGetIPInfoResponse as IPInfoGetIPInfoResponse from .custom_page_set_create_params import CustomPageSetCreateParams as CustomPageSetCreateParams from .custom_page_set_update_params import CustomPageSetUpdateParams as CustomPageSetUpdateParams from .ip_info_get_top_urls_response import IPInfoGetTopURLsResponse as IPInfoGetTopURLsResponse diff --git a/src/gcore/types/waap/ip_info_get_top_urls_response.py b/src/gcore/types/waap/ip_info_get_top_urls_response.py index 0db2c8ce..76dc6cdb 100644 --- a/src/gcore/types/waap/ip_info_get_top_urls_response.py +++ b/src/gcore/types/waap/ip_info_get_top_urls_response.py @@ -3,17 +3,8 @@ from typing import List from typing_extensions import TypeAlias -from ..._models import BaseModel +from .waap_top_url import WaapTopURL -__all__ = ["IPInfoGetTopURLsResponse", "IPInfoGetTopURLsResponseItem"] +__all__ = ["IPInfoGetTopURLsResponse"] - -class IPInfoGetTopURLsResponseItem(BaseModel): - count: int - """The number of attacks to the URL""" - - url: str - """The URL that was attacked""" - - -IPInfoGetTopURLsResponse: TypeAlias = List[IPInfoGetTopURLsResponseItem] +IPInfoGetTopURLsResponse: TypeAlias = List[WaapTopURL] diff --git a/src/gcore/types/waap/ip_info_get_ip_info_response.py b/src/gcore/types/waap/waap_ip_info.py similarity index 93% rename from src/gcore/types/waap/ip_info_get_ip_info_response.py rename to src/gcore/types/waap/waap_ip_info.py index 82fc8e8d..741e7e2f 100644 --- a/src/gcore/types/waap/ip_info_get_ip_info_response.py +++ b/src/gcore/types/waap/waap_ip_info.py @@ -5,7 +5,7 @@ from ..._models import BaseModel -__all__ = ["IPInfoGetIPInfoResponse", "Whois"] +__all__ = ["WaapIPInfo", "Whois"] class Whois(BaseModel): @@ -46,7 +46,7 @@ class Whois(BaseModel): """The state""" -class IPInfoGetIPInfoResponse(BaseModel): +class WaapIPInfo(BaseModel): risk_score: Literal["NO_RISK", "LOW", "MEDIUM", "HIGH", "EXTREME", "NOT_ENOUGH_DATA"] """The risk score of the IP address""" diff --git a/src/gcore/types/waap/waap_top_url.py b/src/gcore/types/waap/waap_top_url.py new file mode 100644 index 00000000..88d761f8 --- /dev/null +++ b/src/gcore/types/waap/waap_top_url.py @@ -0,0 +1,13 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from ..._models import BaseModel + +__all__ = ["WaapTopURL"] + + +class WaapTopURL(BaseModel): + count: int + """The number of attacks to the URL""" + + url: str + """The URL that was attacked""" diff --git a/tests/api_resources/waap/test_ip_info.py b/tests/api_resources/waap/test_ip_info.py index 49b4f4f3..e3b42484 100644 --- a/tests/api_resources/waap/test_ip_info.py +++ b/tests/api_resources/waap/test_ip_info.py @@ -10,8 +10,8 @@ from gcore import Gcore, AsyncGcore from tests.utils import assert_matches_type from gcore.types.waap import ( + WaapIPInfo, WaapIPDDOSInfoModel, - IPInfoGetIPInfoResponse, IPInfoGetTopURLsResponse, IPInfoGetTopUserAgentsResponse, IPInfoGetBlockedRequestsResponse, @@ -127,7 +127,7 @@ def test_method_get_ip_info(self, client: Gcore) -> None: ip_info = client.waap.ip_info.get_ip_info( ip="192.168.1.1", ) - assert_matches_type(IPInfoGetIPInfoResponse, ip_info, path=["response"]) + assert_matches_type(WaapIPInfo, ip_info, path=["response"]) @parametrize def test_raw_response_get_ip_info(self, client: Gcore) -> None: @@ -138,7 +138,7 @@ def test_raw_response_get_ip_info(self, client: Gcore) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" ip_info = response.parse() - assert_matches_type(IPInfoGetIPInfoResponse, ip_info, path=["response"]) + assert_matches_type(WaapIPInfo, ip_info, path=["response"]) @parametrize def test_streaming_response_get_ip_info(self, client: Gcore) -> None: @@ -149,7 +149,7 @@ def test_streaming_response_get_ip_info(self, client: Gcore) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" ip_info = response.parse() - assert_matches_type(IPInfoGetIPInfoResponse, ip_info, path=["response"]) + assert_matches_type(WaapIPInfo, ip_info, path=["response"]) assert cast(Any, response.is_closed) is True @@ -393,7 +393,7 @@ async def test_method_get_ip_info(self, async_client: AsyncGcore) -> None: ip_info = await async_client.waap.ip_info.get_ip_info( ip="192.168.1.1", ) - assert_matches_type(IPInfoGetIPInfoResponse, ip_info, path=["response"]) + assert_matches_type(WaapIPInfo, ip_info, path=["response"]) @parametrize async def test_raw_response_get_ip_info(self, async_client: AsyncGcore) -> None: @@ -404,7 +404,7 @@ async def test_raw_response_get_ip_info(self, async_client: AsyncGcore) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" ip_info = await response.parse() - assert_matches_type(IPInfoGetIPInfoResponse, ip_info, path=["response"]) + assert_matches_type(WaapIPInfo, ip_info, path=["response"]) @parametrize async def test_streaming_response_get_ip_info(self, async_client: AsyncGcore) -> None: @@ -415,7 +415,7 @@ async def test_streaming_response_get_ip_info(self, async_client: AsyncGcore) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" ip_info = await response.parse() - assert_matches_type(IPInfoGetIPInfoResponse, ip_info, path=["response"]) + assert_matches_type(WaapIPInfo, ip_info, path=["response"]) assert cast(Any, response.is_closed) is True From 86f34b8a47bc5c1021f1b983ce2306403db2683f Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Thu, 11 Sep 2025 10:20:04 +0000 Subject: [PATCH 02/16] codegen metadata --- .stats.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.stats.yml b/.stats.yml index 6b134832..f9d63b57 100644 --- a/.stats.yml +++ b/.stats.yml @@ -1,4 +1,4 @@ configured_endpoints: 523 openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/gcore%2Fgcore-fa5e3eb5c4c01c6be5a8d036640779fa59a1931c596245748ed28601213caa3b.yml openapi_spec_hash: 2ad55753d983df577077b3ce156ac4ca -config_hash: 48160a994660f9410c8552e51274bef9 +config_hash: 28b1157595821f9f0eb3e9f3ea690703 From 484ee1144558b56f40d5bc41b9613370dc74c42e Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Thu, 11 Sep 2025 14:10:22 +0000 Subject: [PATCH 03/16] feat(api): aggregated API specs update --- .stats.yml | 4 +- src/gcore/resources/cloud/floating_ips.py | 24 +++++ .../api_resources/cloud/test_floating_ips.py | 88 +++++++++---------- 3 files changed, 70 insertions(+), 46 deletions(-) diff --git a/.stats.yml b/.stats.yml index f9d63b57..108f1671 100644 --- a/.stats.yml +++ b/.stats.yml @@ -1,4 +1,4 @@ configured_endpoints: 523 -openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/gcore%2Fgcore-fa5e3eb5c4c01c6be5a8d036640779fa59a1931c596245748ed28601213caa3b.yml -openapi_spec_hash: 2ad55753d983df577077b3ce156ac4ca +openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/gcore%2Fgcore-b0e93e2128f920111ddf34b3de83232ca518082c681daff1f6277e578a10ad86.yml +openapi_spec_hash: e76f6f0cf1c92f2944aa3daed70bed0f config_hash: 28b1157595821f9f0eb3e9f3ea690703 diff --git a/src/gcore/resources/cloud/floating_ips.py b/src/gcore/resources/cloud/floating_ips.py index 85d1e774..fe0fb27b 100644 --- a/src/gcore/resources/cloud/floating_ips.py +++ b/src/gcore/resources/cloud/floating_ips.py @@ -192,6 +192,12 @@ def delete( Delete floating IP Args: + project_id: Project ID + + region_id: Region ID + + floating_ip_id: Floating IP ID + extra_headers: Send extra headers extra_query: Add additional query parameters to the request @@ -283,6 +289,12 @@ def get( Get floating IP Args: + project_id: Project ID + + region_id: Region ID + + floating_ip_id: Floating IP ID + extra_headers: Send extra headers extra_query: Add additional query parameters to the request @@ -595,6 +607,12 @@ async def delete( Delete floating IP Args: + project_id: Project ID + + region_id: Region ID + + floating_ip_id: Floating IP ID + extra_headers: Send extra headers extra_query: Add additional query parameters to the request @@ -686,6 +704,12 @@ async def get( Get floating IP Args: + project_id: Project ID + + region_id: Region ID + + floating_ip_id: Floating IP ID + extra_headers: Send extra headers extra_query: Add additional query parameters to the request diff --git a/tests/api_resources/cloud/test_floating_ips.py b/tests/api_resources/cloud/test_floating_ips.py index a0772131..70598a35 100644 --- a/tests/api_resources/cloud/test_floating_ips.py +++ b/tests/api_resources/cloud/test_floating_ips.py @@ -116,18 +116,18 @@ def test_streaming_response_list(self, client: Gcore) -> None: @parametrize def test_method_delete(self, client: Gcore) -> None: floating_ip = client.cloud.floating_ips.delete( - floating_ip_id="floating_ip_id", - project_id=0, - region_id=0, + floating_ip_id="c64e5db1-5f1f-43ec-a8d9-5090df85b82d", + project_id=1, + region_id=1, ) assert_matches_type(TaskIDList, floating_ip, path=["response"]) @parametrize def test_raw_response_delete(self, client: Gcore) -> None: response = client.cloud.floating_ips.with_raw_response.delete( - floating_ip_id="floating_ip_id", - project_id=0, - region_id=0, + floating_ip_id="c64e5db1-5f1f-43ec-a8d9-5090df85b82d", + project_id=1, + region_id=1, ) assert response.is_closed is True @@ -138,9 +138,9 @@ def test_raw_response_delete(self, client: Gcore) -> None: @parametrize def test_streaming_response_delete(self, client: Gcore) -> None: with client.cloud.floating_ips.with_streaming_response.delete( - floating_ip_id="floating_ip_id", - project_id=0, - region_id=0, + floating_ip_id="c64e5db1-5f1f-43ec-a8d9-5090df85b82d", + project_id=1, + region_id=1, ) as response: assert not response.is_closed assert response.http_request.headers.get("X-Stainless-Lang") == "python" @@ -155,8 +155,8 @@ def test_path_params_delete(self, client: Gcore) -> None: with pytest.raises(ValueError, match=r"Expected a non-empty value for `floating_ip_id` but received ''"): client.cloud.floating_ips.with_raw_response.delete( floating_ip_id="", - project_id=0, - region_id=0, + project_id=1, + region_id=1, ) @parametrize @@ -223,18 +223,18 @@ def test_path_params_assign(self, client: Gcore) -> None: @parametrize def test_method_get(self, client: Gcore) -> None: floating_ip = client.cloud.floating_ips.get( - floating_ip_id="floating_ip_id", - project_id=0, - region_id=0, + floating_ip_id="c64e5db1-5f1f-43ec-a8d9-5090df85b82d", + project_id=1, + region_id=1, ) assert_matches_type(FloatingIP, floating_ip, path=["response"]) @parametrize def test_raw_response_get(self, client: Gcore) -> None: response = client.cloud.floating_ips.with_raw_response.get( - floating_ip_id="floating_ip_id", - project_id=0, - region_id=0, + floating_ip_id="c64e5db1-5f1f-43ec-a8d9-5090df85b82d", + project_id=1, + region_id=1, ) assert response.is_closed is True @@ -245,9 +245,9 @@ def test_raw_response_get(self, client: Gcore) -> None: @parametrize def test_streaming_response_get(self, client: Gcore) -> None: with client.cloud.floating_ips.with_streaming_response.get( - floating_ip_id="floating_ip_id", - project_id=0, - region_id=0, + floating_ip_id="c64e5db1-5f1f-43ec-a8d9-5090df85b82d", + project_id=1, + region_id=1, ) as response: assert not response.is_closed assert response.http_request.headers.get("X-Stainless-Lang") == "python" @@ -262,8 +262,8 @@ def test_path_params_get(self, client: Gcore) -> None: with pytest.raises(ValueError, match=r"Expected a non-empty value for `floating_ip_id` but received ''"): client.cloud.floating_ips.with_raw_response.get( floating_ip_id="", - project_id=0, - region_id=0, + project_id=1, + region_id=1, ) @parametrize @@ -412,18 +412,18 @@ async def test_streaming_response_list(self, async_client: AsyncGcore) -> None: @parametrize async def test_method_delete(self, async_client: AsyncGcore) -> None: floating_ip = await async_client.cloud.floating_ips.delete( - floating_ip_id="floating_ip_id", - project_id=0, - region_id=0, + floating_ip_id="c64e5db1-5f1f-43ec-a8d9-5090df85b82d", + project_id=1, + region_id=1, ) assert_matches_type(TaskIDList, floating_ip, path=["response"]) @parametrize async def test_raw_response_delete(self, async_client: AsyncGcore) -> None: response = await async_client.cloud.floating_ips.with_raw_response.delete( - floating_ip_id="floating_ip_id", - project_id=0, - region_id=0, + floating_ip_id="c64e5db1-5f1f-43ec-a8d9-5090df85b82d", + project_id=1, + region_id=1, ) assert response.is_closed is True @@ -434,9 +434,9 @@ async def test_raw_response_delete(self, async_client: AsyncGcore) -> None: @parametrize async def test_streaming_response_delete(self, async_client: AsyncGcore) -> None: async with async_client.cloud.floating_ips.with_streaming_response.delete( - floating_ip_id="floating_ip_id", - project_id=0, - region_id=0, + floating_ip_id="c64e5db1-5f1f-43ec-a8d9-5090df85b82d", + project_id=1, + region_id=1, ) as response: assert not response.is_closed assert response.http_request.headers.get("X-Stainless-Lang") == "python" @@ -451,8 +451,8 @@ async def test_path_params_delete(self, async_client: AsyncGcore) -> None: with pytest.raises(ValueError, match=r"Expected a non-empty value for `floating_ip_id` but received ''"): await async_client.cloud.floating_ips.with_raw_response.delete( floating_ip_id="", - project_id=0, - region_id=0, + project_id=1, + region_id=1, ) @parametrize @@ -519,18 +519,18 @@ async def test_path_params_assign(self, async_client: AsyncGcore) -> None: @parametrize async def test_method_get(self, async_client: AsyncGcore) -> None: floating_ip = await async_client.cloud.floating_ips.get( - floating_ip_id="floating_ip_id", - project_id=0, - region_id=0, + floating_ip_id="c64e5db1-5f1f-43ec-a8d9-5090df85b82d", + project_id=1, + region_id=1, ) assert_matches_type(FloatingIP, floating_ip, path=["response"]) @parametrize async def test_raw_response_get(self, async_client: AsyncGcore) -> None: response = await async_client.cloud.floating_ips.with_raw_response.get( - floating_ip_id="floating_ip_id", - project_id=0, - region_id=0, + floating_ip_id="c64e5db1-5f1f-43ec-a8d9-5090df85b82d", + project_id=1, + region_id=1, ) assert response.is_closed is True @@ -541,9 +541,9 @@ async def test_raw_response_get(self, async_client: AsyncGcore) -> None: @parametrize async def test_streaming_response_get(self, async_client: AsyncGcore) -> None: async with async_client.cloud.floating_ips.with_streaming_response.get( - floating_ip_id="floating_ip_id", - project_id=0, - region_id=0, + floating_ip_id="c64e5db1-5f1f-43ec-a8d9-5090df85b82d", + project_id=1, + region_id=1, ) as response: assert not response.is_closed assert response.http_request.headers.get("X-Stainless-Lang") == "python" @@ -558,8 +558,8 @@ async def test_path_params_get(self, async_client: AsyncGcore) -> None: with pytest.raises(ValueError, match=r"Expected a non-empty value for `floating_ip_id` but received ''"): await async_client.cloud.floating_ips.with_raw_response.get( floating_ip_id="", - project_id=0, - region_id=0, + project_id=1, + region_id=1, ) @parametrize From 4c050cd3bc1498342ad69bb05046f3cefa4fae19 Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Thu, 11 Sep 2025 14:20:24 +0000 Subject: [PATCH 04/16] codegen metadata --- .stats.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.stats.yml b/.stats.yml index 108f1671..0821216a 100644 --- a/.stats.yml +++ b/.stats.yml @@ -1,4 +1,4 @@ configured_endpoints: 523 -openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/gcore%2Fgcore-b0e93e2128f920111ddf34b3de83232ca518082c681daff1f6277e578a10ad86.yml -openapi_spec_hash: e76f6f0cf1c92f2944aa3daed70bed0f +openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/gcore%2Fgcore-698f6e25022abbe89e2e5e1dd25d882f75001f469dd8a6ff26cbf726eadd9bc2.yml +openapi_spec_hash: 5999cb3b726ce1b7b3d44594bddf8d25 config_hash: 28b1157595821f9f0eb3e9f3ea690703 From ccf4739750f27e01ece2ff147458dd7fe9305437 Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Fri, 12 Sep 2025 08:11:59 +0000 Subject: [PATCH 05/16] feat(api): aggregated API specs update --- .stats.yml | 4 ++-- src/gcore/types/cloud/floating_ip.py | 2 +- src/gcore/types/cloud/floating_ip_detailed.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.stats.yml b/.stats.yml index 0821216a..1c9e09d4 100644 --- a/.stats.yml +++ b/.stats.yml @@ -1,4 +1,4 @@ configured_endpoints: 523 -openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/gcore%2Fgcore-698f6e25022abbe89e2e5e1dd25d882f75001f469dd8a6ff26cbf726eadd9bc2.yml -openapi_spec_hash: 5999cb3b726ce1b7b3d44594bddf8d25 +openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/gcore%2Fgcore-73daaa52c3abe2ede71458fb16b9c50e20fbb16133b90b3e7b7f516277532da5.yml +openapi_spec_hash: e226b124391b1e9f62b9c1ddae64d5c9 config_hash: 28b1157595821f9f0eb3e9f3ea690703 diff --git a/src/gcore/types/cloud/floating_ip.py b/src/gcore/types/cloud/floating_ip.py index ffcc744a..61d3995d 100644 --- a/src/gcore/types/cloud/floating_ip.py +++ b/src/gcore/types/cloud/floating_ip.py @@ -11,7 +11,7 @@ class FloatingIP(BaseModel): - id: Optional[str] = None + id: str """Floating IP ID""" created_at: datetime diff --git a/src/gcore/types/cloud/floating_ip_detailed.py b/src/gcore/types/cloud/floating_ip_detailed.py index 2f4c6a3c..1692fc87 100644 --- a/src/gcore/types/cloud/floating_ip_detailed.py +++ b/src/gcore/types/cloud/floating_ip_detailed.py @@ -153,7 +153,7 @@ class Instance(BaseModel): class FloatingIPDetailed(BaseModel): - id: Optional[str] = None + id: str """Floating IP ID""" created_at: datetime From bf8a5ddff3e777441db47163dc03b73052d99ecd Mon Sep 17 00:00:00 2001 From: Pedro Oliveira <8281907+pedrodeoliveira@users.noreply.github.com> Date: Fri, 12 Sep 2025 10:20:54 +0100 Subject: [PATCH 06/16] fix(cloud): floating ips examples --- examples/cloud/floating_ips.py | 2 -- examples/cloud/floating_ips_async.py | 2 -- 2 files changed, 4 deletions(-) diff --git a/examples/cloud/floating_ips.py b/examples/cloud/floating_ips.py index 70777db7..ed5dd2c2 100644 --- a/examples/cloud/floating_ips.py +++ b/examples/cloud/floating_ips.py @@ -34,8 +34,6 @@ def main() -> None: def create_floating_ip(*, client: Gcore) -> str: print("\n=== CREATE FLOATING IP ===") floating_ip = client.cloud.floating_ips.create_and_poll(tags={"name": "gcore-go-example"}) - if floating_ip.id is None: - raise RuntimeError("Failed to create floating IP") print(f"Created Floating IP: ID={floating_ip.id}") print("========================") return floating_ip.id diff --git a/examples/cloud/floating_ips_async.py b/examples/cloud/floating_ips_async.py index 7e41623d..f79c81ef 100644 --- a/examples/cloud/floating_ips_async.py +++ b/examples/cloud/floating_ips_async.py @@ -35,8 +35,6 @@ async def main() -> None: async def create_floating_ip(*, client: AsyncGcore) -> str: print("\n=== CREATE FLOATING IP ===") floating_ip = await client.cloud.floating_ips.create_and_poll(tags={"name": "gcore-go-example"}) - if floating_ip.id is None: - raise RuntimeError("Failed to create floating IP") print(f"Created floating IP: ID={floating_ip.id}") print("========================") return floating_ip.id From a2de60c773c01aeb6223001a0d8bff5463fa82ef Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Fri, 12 Sep 2025 13:02:07 +0000 Subject: [PATCH 07/16] feat(api): aggregated API specs update --- .stats.yml | 4 +- src/gcore/_client.py | 10 +- src/gcore/resources/cloud/audit_logs.py | 8 +- .../resources/cloud/baremetal/flavors.py | 8 +- src/gcore/resources/cloud/baremetal/images.py | 8 +- .../resources/cloud/baremetal/servers.py | 24 ++- .../resources/cloud/billing_reservations.py | 16 +- src/gcore/resources/cloud/cost_reports.py | 24 ++- .../cloud/file_shares/access_rules.py | 24 ++- .../cloud/file_shares/file_shares.py | 48 +++-- src/gcore/resources/cloud/floating_ips.py | 48 +++-- .../cloud/gpu_baremetal_clusters/flavors.py | 8 +- .../gpu_baremetal_clusters.py | 64 ++++-- .../cloud/gpu_baremetal_clusters/images.py | 32 ++- .../gpu_baremetal_clusters/interfaces.py | 8 +- .../cloud/gpu_baremetal_clusters/servers.py | 56 ++++-- .../resources/cloud/inference/api_keys.py | 40 +++- .../inference/applications/deployments.py | 40 +++- .../cloud/inference/applications/templates.py | 16 +- .../inference/deployments/deployments.py | 64 ++++-- .../cloud/inference/deployments/logs.py | 8 +- .../resources/cloud/inference/flavors.py | 16 +- .../resources/cloud/inference/inference.py | 8 +- .../cloud/inference/registry_credentials.py | 40 +++- .../resources/cloud/inference/secrets.py | 40 +++- .../resources/cloud/instances/flavors.py | 8 +- src/gcore/resources/cloud/instances/images.py | 48 +++-- .../resources/cloud/instances/instances.py | 112 ++++++++--- .../resources/cloud/instances/interfaces.py | 24 ++- .../resources/cloud/instances/metrics.py | 8 +- src/gcore/resources/cloud/ip_ranges.py | 8 +- .../resources/cloud/k8s/clusters/clusters.py | 72 +++++-- .../resources/cloud/k8s/clusters/nodes.py | 16 +- .../cloud/k8s/clusters/pools/nodes.py | 16 +- .../cloud/k8s/clusters/pools/pools.py | 48 +++-- src/gcore/resources/cloud/k8s/flavors.py | 8 +- src/gcore/resources/cloud/k8s/k8s.py | 8 +- .../resources/cloud/load_balancers/flavors.py | 8 +- .../load_balancers/l7_policies/l7_policies.py | 40 +++- .../cloud/load_balancers/l7_policies/rules.py | 40 +++- .../cloud/load_balancers/listeners.py | 40 +++- .../cloud/load_balancers/load_balancers.py | 56 ++++-- .../resources/cloud/load_balancers/metrics.py | 8 +- .../load_balancers/pools/health_monitors.py | 16 +- .../cloud/load_balancers/pools/members.py | 16 +- .../cloud/load_balancers/pools/pools.py | 40 +++- .../cloud/load_balancers/statuses.py | 16 +- .../resources/cloud/networks/networks.py | 40 +++- src/gcore/resources/cloud/networks/routers.py | 56 ++++-- src/gcore/resources/cloud/networks/subnets.py | 40 +++- src/gcore/resources/cloud/placement_groups.py | 32 ++- src/gcore/resources/cloud/projects.py | 32 ++- src/gcore/resources/cloud/quotas/quotas.py | 24 ++- src/gcore/resources/cloud/quotas/requests.py | 32 ++- src/gcore/resources/cloud/regions.py | 12 +- .../resources/cloud/registries/artifacts.py | 16 +- .../resources/cloud/registries/registries.py | 40 +++- .../cloud/registries/repositories.py | 16 +- src/gcore/resources/cloud/registries/tags.py | 8 +- src/gcore/resources/cloud/registries/users.py | 48 +++-- .../reserved_fixed_ips/reserved_fixed_ips.py | 32 ++- .../resources/cloud/reserved_fixed_ips/vip.py | 40 +++- src/gcore/resources/cloud/secrets.py | 32 ++- .../resources/cloud/security_groups/rules.py | 24 ++- .../cloud/security_groups/security_groups.py | 56 ++++-- src/gcore/resources/cloud/ssh_keys.py | 40 +++- src/gcore/resources/cloud/tasks.py | 28 ++- src/gcore/resources/cloud/usage_reports.py | 8 +- .../resources/cloud/users/role_assignments.py | 32 ++- src/gcore/resources/cloud/volumes.py | 80 ++++++-- src/gcore/resources/dns/dns.py | 12 +- src/gcore/resources/dns/locations.py | 28 ++- src/gcore/resources/dns/metrics.py | 8 +- src/gcore/resources/dns/pickers/pickers.py | 4 +- src/gcore/resources/dns/pickers/presets.py | 8 +- src/gcore/resources/dns/zones/dnssec.py | 16 +- src/gcore/resources/dns/zones/rrsets.py | 48 +++-- src/gcore/resources/dns/zones/zones.py | 80 +++++--- src/gcore/resources/fastedge/apps/apps.py | 40 ++-- src/gcore/resources/fastedge/apps/logs.py | 8 +- src/gcore/resources/fastedge/binaries.py | 32 ++- src/gcore/resources/fastedge/fastedge.py | 4 +- src/gcore/resources/fastedge/kv_stores.py | 32 ++- src/gcore/resources/fastedge/secrets.py | 48 +++-- src/gcore/resources/fastedge/statistics.py | 16 +- src/gcore/resources/fastedge/templates.py | 40 +++- src/gcore/resources/iam/api_tokens.py | 32 ++- src/gcore/resources/iam/iam.py | 4 +- src/gcore/resources/iam/users.py | 36 +++- src/gcore/resources/security/bgp_announces.py | 16 +- src/gcore/resources/security/events.py | 8 +- .../resources/security/profile_templates.py | 8 +- src/gcore/resources/security/profiles.py | 48 +++-- .../resources/storage/buckets/buckets.py | 24 ++- src/gcore/resources/storage/buckets/cors.py | 16 +- .../resources/storage/buckets/lifecycle.py | 16 +- src/gcore/resources/storage/buckets/policy.py | 24 ++- src/gcore/resources/storage/credentials.py | 8 +- src/gcore/resources/storage/locations.py | 8 +- src/gcore/resources/storage/statistics.py | 16 +- src/gcore/resources/storage/storage.py | 64 ++++-- src/gcore/resources/streaming/ai_tasks.py | 28 ++- src/gcore/resources/streaming/broadcasts.py | 48 +++-- src/gcore/resources/streaming/directories.py | 40 +++- src/gcore/resources/streaming/players.py | 40 ++-- src/gcore/resources/streaming/playlists.py | 48 +++-- src/gcore/resources/streaming/quality_sets.py | 16 +- src/gcore/resources/streaming/restreams.py | 40 +++- src/gcore/resources/streaming/statistics.py | 184 +++++++++++++----- .../resources/streaming/streams/overlays.py | 48 +++-- .../resources/streaming/streams/streams.py | 72 +++++-- .../resources/streaming/videos/subtitles.py | 40 +++- .../resources/streaming/videos/videos.py | 56 ++++-- src/gcore/resources/waap/advanced_rules.py | 8 +- src/gcore/resources/waap/custom_page_sets.py | 48 +++-- .../resources/waap/domains/advanced_rules.py | 48 +++-- .../resources/waap/domains/api_discovery.py | 48 +++-- .../resources/waap/domains/api_path_groups.py | 8 +- src/gcore/resources/waap/domains/api_paths.py | 40 +++- .../resources/waap/domains/custom_rules.py | 56 ++++-- src/gcore/resources/waap/domains/domains.py | 44 +++-- .../resources/waap/domains/firewall_rules.py | 56 ++++-- .../waap/domains/insight_silences.py | 40 +++- src/gcore/resources/waap/domains/insights.py | 24 ++- src/gcore/resources/waap/domains/settings.py | 16 +- .../resources/waap/domains/statistics.py | 48 +++-- src/gcore/resources/waap/insights.py | 8 +- src/gcore/resources/waap/ip_info/ip_info.py | 64 ++++-- src/gcore/resources/waap/ip_info/metrics.py | 8 +- src/gcore/resources/waap/organizations.py | 8 +- src/gcore/resources/waap/statistics.py | 8 +- src/gcore/resources/waap/tags.py | 4 +- src/gcore/resources/waap/waap.py | 4 +- 133 files changed, 3036 insertions(+), 1050 deletions(-) diff --git a/.stats.yml b/.stats.yml index 1c9e09d4..623270eb 100644 --- a/.stats.yml +++ b/.stats.yml @@ -1,4 +1,4 @@ configured_endpoints: 523 -openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/gcore%2Fgcore-73daaa52c3abe2ede71458fb16b9c50e20fbb16133b90b3e7b7f516277532da5.yml -openapi_spec_hash: e226b124391b1e9f62b9c1ddae64d5c9 +openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/gcore%2Fgcore-5d5a213a2cafe76bf32aee1ad65af4e90d3d00b4d6fc90672aaf5e8f66f3f132.yml +openapi_spec_hash: 92b967214f53666d69d5cc9df277376e config_hash: 28b1157595821f9f0eb3e9f3ea690703 diff --git a/src/gcore/_client.py b/src/gcore/_client.py index fb66fd59..94bb9d2b 100644 --- a/src/gcore/_client.py +++ b/src/gcore/_client.py @@ -113,6 +113,7 @@ def __init__( 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" @@ -197,7 +198,7 @@ def copy( params = set_default_query http_client = http_client or self._client - return self.__class__( + client = 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, @@ -210,6 +211,8 @@ def copy( 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(...) @@ -340,6 +343,7 @@ def __init__( 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" @@ -424,7 +428,7 @@ def copy( params = set_default_query http_client = http_client or self._client - return self.__class__( + client = 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, @@ -437,6 +441,8 @@ def copy( 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(...) diff --git a/src/gcore/resources/cloud/audit_logs.py b/src/gcore/resources/cloud/audit_logs.py index 1dad329f..1f4ae40e 100644 --- a/src/gcore/resources/cloud/audit_logs.py +++ b/src/gcore/resources/cloud/audit_logs.py @@ -206,7 +206,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v1/user_actions", + "/cloud/v1/user_actions" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v1/user_actions", page=SyncOffsetPage[AuditLogEntry], options=make_request_options( extra_headers=extra_headers, @@ -415,7 +417,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v1/user_actions", + "/cloud/v1/user_actions" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v1/user_actions", page=AsyncOffsetPage[AuditLogEntry], options=make_request_options( extra_headers=extra_headers, diff --git a/src/gcore/resources/cloud/baremetal/flavors.py b/src/gcore/resources/cloud/baremetal/flavors.py index 1645b30b..91474de4 100644 --- a/src/gcore/resources/cloud/baremetal/flavors.py +++ b/src/gcore/resources/cloud/baremetal/flavors.py @@ -93,7 +93,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/bmflavors/{project_id}/{region_id}", + f"/cloud/v1/bmflavors/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/bmflavors/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -187,7 +189,9 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/bmflavors/{project_id}/{region_id}", + f"/cloud/v1/bmflavors/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/bmflavors/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/cloud/baremetal/images.py b/src/gcore/resources/cloud/baremetal/images.py index a6a22954..ecc0adc3 100644 --- a/src/gcore/resources/cloud/baremetal/images.py +++ b/src/gcore/resources/cloud/baremetal/images.py @@ -90,7 +90,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/bmimages/{project_id}/{region_id}", + f"/cloud/v1/bmimages/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/bmimages/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -178,7 +180,9 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/bmimages/{project_id}/{region_id}", + f"/cloud/v1/bmimages/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/bmimages/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/cloud/baremetal/servers.py b/src/gcore/resources/cloud/baremetal/servers.py index d9120d43..83156790 100644 --- a/src/gcore/resources/cloud/baremetal/servers.py +++ b/src/gcore/resources/cloud/baremetal/servers.py @@ -156,7 +156,9 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/bminstances/{project_id}/{region_id}", + f"/cloud/v1/bminstances/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/bminstances/{project_id}/{region_id}", body=maybe_transform( { "flavor": flavor, @@ -294,7 +296,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/bminstances/{project_id}/{region_id}", + f"/cloud/v1/bminstances/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/bminstances/{project_id}/{region_id}", page=SyncOffsetPage[BaremetalServer], options=make_request_options( extra_headers=extra_headers, @@ -377,7 +381,9 @@ def rebuild( if not server_id: raise ValueError(f"Expected a non-empty value for `server_id` but received {server_id!r}") return self._post( - f"/cloud/v1/bminstances/{project_id}/{region_id}/{server_id}/rebuild", + f"/cloud/v1/bminstances/{project_id}/{region_id}/{server_id}/rebuild" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/bminstances/{project_id}/{region_id}/{server_id}/rebuild", body=maybe_transform( { "image_id": image_id, @@ -638,7 +644,9 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/bminstances/{project_id}/{region_id}", + f"/cloud/v1/bminstances/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/bminstances/{project_id}/{region_id}", body=await async_maybe_transform( { "flavor": flavor, @@ -776,7 +784,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/bminstances/{project_id}/{region_id}", + f"/cloud/v1/bminstances/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/bminstances/{project_id}/{region_id}", page=AsyncOffsetPage[BaremetalServer], options=make_request_options( extra_headers=extra_headers, @@ -859,7 +869,9 @@ async def rebuild( if not server_id: raise ValueError(f"Expected a non-empty value for `server_id` but received {server_id!r}") return await self._post( - f"/cloud/v1/bminstances/{project_id}/{region_id}/{server_id}/rebuild", + f"/cloud/v1/bminstances/{project_id}/{region_id}/{server_id}/rebuild" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/bminstances/{project_id}/{region_id}/{server_id}/rebuild", body=await async_maybe_transform( { "image_id": image_id, diff --git a/src/gcore/resources/cloud/billing_reservations.py b/src/gcore/resources/cloud/billing_reservations.py index 0d9df747..ae49d667 100644 --- a/src/gcore/resources/cloud/billing_reservations.py +++ b/src/gcore/resources/cloud/billing_reservations.py @@ -120,7 +120,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v1/reservations", + "/cloud/v1/reservations" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v1/reservations", page=SyncOffsetPage[BillingReservation], options=make_request_options( extra_headers=extra_headers, @@ -174,7 +176,9 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/cloud/v1/reservations/{reservation_id}", + f"/cloud/v1/reservations/{reservation_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/reservations/{reservation_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -276,7 +280,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v1/reservations", + "/cloud/v1/reservations" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v1/reservations", page=AsyncOffsetPage[BillingReservation], options=make_request_options( extra_headers=extra_headers, @@ -330,7 +336,9 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/cloud/v1/reservations/{reservation_id}", + f"/cloud/v1/reservations/{reservation_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/reservations/{reservation_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/cost_reports.py b/src/gcore/resources/cloud/cost_reports.py index 36075dd6..910b8fa7 100644 --- a/src/gcore/resources/cloud/cost_reports.py +++ b/src/gcore/resources/cloud/cost_reports.py @@ -146,7 +146,9 @@ def get_aggregated( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/cloud/v1/cost_report/totals", + "/cloud/v1/cost_report/totals" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v1/cost_report/totals", body=maybe_transform( { "time_from": time_from, @@ -255,7 +257,9 @@ def get_aggregated_monthly( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/cloud/v1/reservation_cost_report/totals", + "/cloud/v1/reservation_cost_report/totals" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v1/reservation_cost_report/totals", body=maybe_transform( { "regions": regions, @@ -381,7 +385,9 @@ def get_detailed( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/cloud/v1/cost_report/resources", + "/cloud/v1/cost_report/resources" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v1/cost_report/resources", body=maybe_transform( { "time_from": time_from, @@ -522,7 +528,9 @@ async def get_aggregated( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/cloud/v1/cost_report/totals", + "/cloud/v1/cost_report/totals" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v1/cost_report/totals", body=await async_maybe_transform( { "time_from": time_from, @@ -631,7 +639,9 @@ async def get_aggregated_monthly( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/cloud/v1/reservation_cost_report/totals", + "/cloud/v1/reservation_cost_report/totals" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v1/reservation_cost_report/totals", body=await async_maybe_transform( { "regions": regions, @@ -757,7 +767,9 @@ async def get_detailed( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/cloud/v1/cost_report/resources", + "/cloud/v1/cost_report/resources" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v1/cost_report/resources", body=await async_maybe_transform( { "time_from": time_from, diff --git a/src/gcore/resources/cloud/file_shares/access_rules.py b/src/gcore/resources/cloud/file_shares/access_rules.py index 34cc65ee..c7c23710 100644 --- a/src/gcore/resources/cloud/file_shares/access_rules.py +++ b/src/gcore/resources/cloud/file_shares/access_rules.py @@ -88,7 +88,9 @@ def create( if not file_share_id: raise ValueError(f"Expected a non-empty value for `file_share_id` but received {file_share_id!r}") return self._post( - f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule", + f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule", body=maybe_transform( { "access_mode": access_mode, @@ -140,7 +142,9 @@ def list( if not file_share_id: raise ValueError(f"Expected a non-empty value for `file_share_id` but received {file_share_id!r}") return self._get( - f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule", + f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -191,7 +195,9 @@ def delete( raise ValueError(f"Expected a non-empty value for `access_rule_id` but received {access_rule_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule/{access_rule_id}", + f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule/{access_rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule/{access_rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -263,7 +269,9 @@ async def create( if not file_share_id: raise ValueError(f"Expected a non-empty value for `file_share_id` but received {file_share_id!r}") return await self._post( - f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule", + f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule", body=await async_maybe_transform( { "access_mode": access_mode, @@ -315,7 +323,9 @@ async def list( if not file_share_id: raise ValueError(f"Expected a non-empty value for `file_share_id` but received {file_share_id!r}") return await self._get( - f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule", + f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -366,7 +376,9 @@ async def delete( raise ValueError(f"Expected a non-empty value for `access_rule_id` but received {access_rule_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule/{access_rule_id}", + f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule/{access_rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule/{access_rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/file_shares/file_shares.py b/src/gcore/resources/cloud/file_shares/file_shares.py index 99a806d5..b35b9ea8 100644 --- a/src/gcore/resources/cloud/file_shares/file_shares.py +++ b/src/gcore/resources/cloud/file_shares/file_shares.py @@ -206,7 +206,9 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/file_shares/{project_id}/{region_id}", + f"/cloud/v1/file_shares/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}", body=maybe_transform( { "name": name, @@ -289,7 +291,9 @@ def update( if not file_share_id: raise ValueError(f"Expected a non-empty value for `file_share_id` but received {file_share_id!r}") return self._patch( - f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}", + f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}", body=maybe_transform( { "name": name, @@ -349,7 +353,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/file_shares/{project_id}/{region_id}", + f"/cloud/v1/file_shares/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}", page=SyncOffsetPage[FileShare], options=make_request_options( extra_headers=extra_headers, @@ -407,7 +413,9 @@ def delete( if not file_share_id: raise ValueError(f"Expected a non-empty value for `file_share_id` but received {file_share_id!r}") return self._delete( - f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}", + f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -452,7 +460,9 @@ def get( if not file_share_id: raise ValueError(f"Expected a non-empty value for `file_share_id` but received {file_share_id!r}") return self._get( - f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}", + f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -500,7 +510,9 @@ def resize( if not file_share_id: raise ValueError(f"Expected a non-empty value for `file_share_id` but received {file_share_id!r}") return self._post( - f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/extend", + f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/extend" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/extend", body=maybe_transform({"size": size}, file_share_resize_params.FileShareResizeParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -675,7 +687,9 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/file_shares/{project_id}/{region_id}", + f"/cloud/v1/file_shares/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}", body=await async_maybe_transform( { "name": name, @@ -758,7 +772,9 @@ async def update( if not file_share_id: raise ValueError(f"Expected a non-empty value for `file_share_id` but received {file_share_id!r}") return await self._patch( - f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}", + f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}", body=await async_maybe_transform( { "name": name, @@ -818,7 +834,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/file_shares/{project_id}/{region_id}", + f"/cloud/v1/file_shares/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}", page=AsyncOffsetPage[FileShare], options=make_request_options( extra_headers=extra_headers, @@ -876,7 +894,9 @@ async def delete( if not file_share_id: raise ValueError(f"Expected a non-empty value for `file_share_id` but received {file_share_id!r}") return await self._delete( - f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}", + f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -921,7 +941,9 @@ async def get( if not file_share_id: raise ValueError(f"Expected a non-empty value for `file_share_id` but received {file_share_id!r}") return await self._get( - f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}", + f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -969,7 +991,9 @@ async def resize( if not file_share_id: raise ValueError(f"Expected a non-empty value for `file_share_id` but received {file_share_id!r}") return await self._post( - f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/extend", + f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/extend" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/extend", body=await async_maybe_transform({"size": size}, file_share_resize_params.FileShareResizeParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout diff --git a/src/gcore/resources/cloud/floating_ips.py b/src/gcore/resources/cloud/floating_ips.py index fe0fb27b..bcf2f518 100644 --- a/src/gcore/resources/cloud/floating_ips.py +++ b/src/gcore/resources/cloud/floating_ips.py @@ -94,7 +94,9 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/floatingips/{project_id}/{region_id}", + f"/cloud/v1/floatingips/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/floatingips/{project_id}/{region_id}", body=maybe_transform( { "fixed_ip_address": fixed_ip_address, @@ -155,7 +157,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/floatingips/{project_id}/{region_id}", + f"/cloud/v1/floatingips/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/floatingips/{project_id}/{region_id}", page=SyncOffsetPage[FloatingIPDetailed], options=make_request_options( extra_headers=extra_headers, @@ -213,7 +217,9 @@ def delete( if not floating_ip_id: raise ValueError(f"Expected a non-empty value for `floating_ip_id` but received {floating_ip_id!r}") return self._delete( - f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}", + f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -258,7 +264,9 @@ def assign( if not floating_ip_id: raise ValueError(f"Expected a non-empty value for `floating_ip_id` but received {floating_ip_id!r}") return self._post( - f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}/assign", + f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}/assign" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}/assign", body=maybe_transform( { "port_id": port_id, @@ -310,7 +318,9 @@ def get( if not floating_ip_id: raise ValueError(f"Expected a non-empty value for `floating_ip_id` but received {floating_ip_id!r}") return self._get( - f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}", + f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -349,7 +359,9 @@ def unassign( if not floating_ip_id: raise ValueError(f"Expected a non-empty value for `floating_ip_id` but received {floating_ip_id!r}") return self._post( - f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}/unassign", + f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}/unassign" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}/unassign", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -509,7 +521,9 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/floatingips/{project_id}/{region_id}", + f"/cloud/v1/floatingips/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/floatingips/{project_id}/{region_id}", body=await async_maybe_transform( { "fixed_ip_address": fixed_ip_address, @@ -570,7 +584,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/floatingips/{project_id}/{region_id}", + f"/cloud/v1/floatingips/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/floatingips/{project_id}/{region_id}", page=AsyncOffsetPage[FloatingIPDetailed], options=make_request_options( extra_headers=extra_headers, @@ -628,7 +644,9 @@ async def delete( if not floating_ip_id: raise ValueError(f"Expected a non-empty value for `floating_ip_id` but received {floating_ip_id!r}") return await self._delete( - f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}", + f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -673,7 +691,9 @@ async def assign( if not floating_ip_id: raise ValueError(f"Expected a non-empty value for `floating_ip_id` but received {floating_ip_id!r}") return await self._post( - f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}/assign", + f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}/assign" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}/assign", body=await async_maybe_transform( { "port_id": port_id, @@ -725,7 +745,9 @@ async def get( if not floating_ip_id: raise ValueError(f"Expected a non-empty value for `floating_ip_id` but received {floating_ip_id!r}") return await self._get( - f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}", + f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -764,7 +786,9 @@ async def unassign( if not floating_ip_id: raise ValueError(f"Expected a non-empty value for `floating_ip_id` but received {floating_ip_id!r}") return await self._post( - f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}/unassign", + f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}/unassign" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}/unassign", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/gpu_baremetal_clusters/flavors.py b/src/gcore/resources/cloud/gpu_baremetal_clusters/flavors.py index 2c4563b5..6d594b3b 100644 --- a/src/gcore/resources/cloud/gpu_baremetal_clusters/flavors.py +++ b/src/gcore/resources/cloud/gpu_baremetal_clusters/flavors.py @@ -80,7 +80,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/flavors", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/flavors" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/flavors", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -157,7 +159,9 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/flavors", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/flavors" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/flavors", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/cloud/gpu_baremetal_clusters/gpu_baremetal_clusters.py b/src/gcore/resources/cloud/gpu_baremetal_clusters/gpu_baremetal_clusters.py index 6a040f84..91ecdaba 100644 --- a/src/gcore/resources/cloud/gpu_baremetal_clusters/gpu_baremetal_clusters.py +++ b/src/gcore/resources/cloud/gpu_baremetal_clusters/gpu_baremetal_clusters.py @@ -156,7 +156,9 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters", body=maybe_transform( { "flavor": flavor, @@ -220,7 +222,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters", page=SyncOffsetPage[GPUBaremetalCluster], options=make_request_options( extra_headers=extra_headers, @@ -291,7 +295,9 @@ def delete( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return self._delete( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -348,7 +354,9 @@ def get( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return self._get( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -387,7 +395,9 @@ def powercycle_all_servers( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return self._post( - f"/cloud/v2/ai/clusters/{project_id}/{region_id}/{cluster_id}/powercycle", + f"/cloud/v2/ai/clusters/{project_id}/{region_id}/{cluster_id}/powercycle" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/ai/clusters/{project_id}/{region_id}/{cluster_id}/powercycle", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -426,7 +436,9 @@ def reboot_all_servers( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return self._post( - f"/cloud/v2/ai/clusters/{project_id}/{region_id}/{cluster_id}/reboot", + f"/cloud/v2/ai/clusters/{project_id}/{region_id}/{cluster_id}/reboot" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/ai/clusters/{project_id}/{region_id}/{cluster_id}/reboot", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -478,7 +490,9 @@ def rebuild( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return self._post( - f"/cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/rebuild", + f"/cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/rebuild" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/rebuild", body=maybe_transform( { "nodes": nodes, @@ -530,7 +544,9 @@ def resize( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return self._post( - f"/cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/resize", + f"/cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/resize" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/resize", body=maybe_transform( {"instances_count": instances_count}, gpu_baremetal_cluster_resize_params.GPUBaremetalClusterResizeParams, @@ -789,7 +805,9 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters", body=await async_maybe_transform( { "flavor": flavor, @@ -853,7 +871,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters", page=AsyncOffsetPage[GPUBaremetalCluster], options=make_request_options( extra_headers=extra_headers, @@ -924,7 +944,9 @@ async def delete( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return await self._delete( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -981,7 +1003,9 @@ async def get( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return await self._get( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1020,7 +1044,9 @@ async def powercycle_all_servers( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return await self._post( - f"/cloud/v2/ai/clusters/{project_id}/{region_id}/{cluster_id}/powercycle", + f"/cloud/v2/ai/clusters/{project_id}/{region_id}/{cluster_id}/powercycle" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/ai/clusters/{project_id}/{region_id}/{cluster_id}/powercycle", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1059,7 +1085,9 @@ async def reboot_all_servers( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return await self._post( - f"/cloud/v2/ai/clusters/{project_id}/{region_id}/{cluster_id}/reboot", + f"/cloud/v2/ai/clusters/{project_id}/{region_id}/{cluster_id}/reboot" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/ai/clusters/{project_id}/{region_id}/{cluster_id}/reboot", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1111,7 +1139,9 @@ async def rebuild( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return await self._post( - f"/cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/rebuild", + f"/cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/rebuild" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/rebuild", body=await async_maybe_transform( { "nodes": nodes, @@ -1163,7 +1193,9 @@ async def resize( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return await self._post( - f"/cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/resize", + f"/cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/resize" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/resize", body=await async_maybe_transform( {"instances_count": instances_count}, gpu_baremetal_cluster_resize_params.GPUBaremetalClusterResizeParams, diff --git a/src/gcore/resources/cloud/gpu_baremetal_clusters/images.py b/src/gcore/resources/cloud/gpu_baremetal_clusters/images.py index 4d1aa992..60a4b6e2 100644 --- a/src/gcore/resources/cloud/gpu_baremetal_clusters/images.py +++ b/src/gcore/resources/cloud/gpu_baremetal_clusters/images.py @@ -79,7 +79,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/images", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -124,7 +126,9 @@ def delete( if not image_id: raise ValueError(f"Expected a non-empty value for `image_id` but received {image_id!r}") return self._delete( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images/{image_id}", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images/{image_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/images/{image_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -205,7 +209,9 @@ def get( if not image_id: raise ValueError(f"Expected a non-empty value for `image_id` but received {image_id!r}") return self._get( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images/{image_id}", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images/{image_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/images/{image_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -280,7 +286,9 @@ def upload( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/images", body=maybe_transform( { "name": name, @@ -422,7 +430,9 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/images", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -467,7 +477,9 @@ async def delete( if not image_id: raise ValueError(f"Expected a non-empty value for `image_id` but received {image_id!r}") return await self._delete( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images/{image_id}", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images/{image_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/images/{image_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -548,7 +560,9 @@ async def get( if not image_id: raise ValueError(f"Expected a non-empty value for `image_id` but received {image_id!r}") return await self._get( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images/{image_id}", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images/{image_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/images/{image_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -623,7 +637,9 @@ async def upload( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/images", body=await async_maybe_transform( { "name": name, diff --git a/src/gcore/resources/cloud/gpu_baremetal_clusters/interfaces.py b/src/gcore/resources/cloud/gpu_baremetal_clusters/interfaces.py index 863ffde8..ad75df3e 100644 --- a/src/gcore/resources/cloud/gpu_baremetal_clusters/interfaces.py +++ b/src/gcore/resources/cloud/gpu_baremetal_clusters/interfaces.py @@ -71,7 +71,9 @@ def list( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return self._get( - f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{cluster_id}/interfaces", + f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{cluster_id}/interfaces" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ai/clusters/{project_id}/{region_id}/{cluster_id}/interfaces", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -131,7 +133,9 @@ async def list( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return await self._get( - f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{cluster_id}/interfaces", + f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{cluster_id}/interfaces" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ai/clusters/{project_id}/{region_id}/{cluster_id}/interfaces", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/gpu_baremetal_clusters/servers.py b/src/gcore/resources/cloud/gpu_baremetal_clusters/servers.py index 5943860d..d08afd04 100644 --- a/src/gcore/resources/cloud/gpu_baremetal_clusters/servers.py +++ b/src/gcore/resources/cloud/gpu_baremetal_clusters/servers.py @@ -143,7 +143,9 @@ def list( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return self._get_api_list( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}/servers", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}/servers" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}/servers", page=SyncOffsetPage[GPUBaremetalClusterServer], options=make_request_options( extra_headers=extra_headers, @@ -209,7 +211,9 @@ def delete( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._delete( - f"/cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/node/{instance_id}", + f"/cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/node/{instance_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/node/{instance_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -490,7 +494,9 @@ def attach_interface( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._post( - f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/attach_interface", + f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/attach_interface" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/attach_interface", body=maybe_transform( { "ddos_profile": ddos_profile, @@ -549,7 +555,9 @@ def detach_interface( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._post( - f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/detach_interface", + f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/detach_interface" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/detach_interface", body=maybe_transform( { "ip_address": ip_address, @@ -595,7 +603,9 @@ def get_console( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._get( - f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/get_console", + f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/get_console" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/get_console", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -634,7 +644,9 @@ def powercycle( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._post( - f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/powercycle", + f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/powercycle" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/powercycle", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -673,7 +685,9 @@ def reboot( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._post( - f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/reboot", + f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/reboot" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/reboot", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -790,7 +804,9 @@ def list( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return self._get_api_list( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}/servers", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}/servers" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}/servers", page=AsyncOffsetPage[GPUBaremetalClusterServer], options=make_request_options( extra_headers=extra_headers, @@ -856,7 +872,9 @@ async def delete( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._delete( - f"/cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/node/{instance_id}", + f"/cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/node/{instance_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/node/{instance_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1139,7 +1157,9 @@ async def attach_interface( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._post( - f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/attach_interface", + f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/attach_interface" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/attach_interface", body=await async_maybe_transform( { "ddos_profile": ddos_profile, @@ -1198,7 +1218,9 @@ async def detach_interface( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._post( - f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/detach_interface", + f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/detach_interface" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/detach_interface", body=await async_maybe_transform( { "ip_address": ip_address, @@ -1244,7 +1266,9 @@ async def get_console( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._get( - f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/get_console", + f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/get_console" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/get_console", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1283,7 +1307,9 @@ async def powercycle( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._post( - f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/powercycle", + f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/powercycle" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/powercycle", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1322,7 +1348,9 @@ async def reboot( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._post( - f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/reboot", + f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/reboot" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/reboot", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/inference/api_keys.py b/src/gcore/resources/cloud/inference/api_keys.py index 98238c19..f9f5ccb9 100644 --- a/src/gcore/resources/cloud/inference/api_keys.py +++ b/src/gcore/resources/cloud/inference/api_keys.py @@ -84,7 +84,9 @@ def create( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._post( - f"/cloud/v3/inference/{project_id}/api_keys", + f"/cloud/v3/inference/{project_id}/api_keys" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/api_keys", body=maybe_transform( { "name": name, @@ -135,7 +137,9 @@ def update( if not api_key_name: raise ValueError(f"Expected a non-empty value for `api_key_name` but received {api_key_name!r}") return self._patch( - f"/cloud/v3/inference/{project_id}/api_keys/{api_key_name}", + f"/cloud/v3/inference/{project_id}/api_keys/{api_key_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/api_keys/{api_key_name}", body=maybe_transform({"description": description}, api_key_update_params.APIKeyUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -178,7 +182,9 @@ def list( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._get_api_list( - f"/cloud/v3/inference/{project_id}/api_keys", + f"/cloud/v3/inference/{project_id}/api_keys" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/api_keys", page=SyncOffsetPage[InferenceAPIKey], options=make_request_options( extra_headers=extra_headers, @@ -233,7 +239,9 @@ def delete( raise ValueError(f"Expected a non-empty value for `api_key_name` but received {api_key_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v3/inference/{project_id}/api_keys/{api_key_name}", + f"/cloud/v3/inference/{project_id}/api_keys/{api_key_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/api_keys/{api_key_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -273,7 +281,9 @@ def get( if not api_key_name: raise ValueError(f"Expected a non-empty value for `api_key_name` but received {api_key_name!r}") return self._get( - f"/cloud/v3/inference/{project_id}/api_keys/{api_key_name}", + f"/cloud/v3/inference/{project_id}/api_keys/{api_key_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/api_keys/{api_key_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -340,7 +350,9 @@ async def create( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return await self._post( - f"/cloud/v3/inference/{project_id}/api_keys", + f"/cloud/v3/inference/{project_id}/api_keys" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/api_keys", body=await async_maybe_transform( { "name": name, @@ -391,7 +403,9 @@ async def update( if not api_key_name: raise ValueError(f"Expected a non-empty value for `api_key_name` but received {api_key_name!r}") return await self._patch( - f"/cloud/v3/inference/{project_id}/api_keys/{api_key_name}", + f"/cloud/v3/inference/{project_id}/api_keys/{api_key_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/api_keys/{api_key_name}", body=await async_maybe_transform({"description": description}, api_key_update_params.APIKeyUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -434,7 +448,9 @@ def list( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._get_api_list( - f"/cloud/v3/inference/{project_id}/api_keys", + f"/cloud/v3/inference/{project_id}/api_keys" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/api_keys", page=AsyncOffsetPage[InferenceAPIKey], options=make_request_options( extra_headers=extra_headers, @@ -489,7 +505,9 @@ async def delete( raise ValueError(f"Expected a non-empty value for `api_key_name` but received {api_key_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v3/inference/{project_id}/api_keys/{api_key_name}", + f"/cloud/v3/inference/{project_id}/api_keys/{api_key_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/api_keys/{api_key_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -529,7 +547,9 @@ async def get( if not api_key_name: raise ValueError(f"Expected a non-empty value for `api_key_name` but received {api_key_name!r}") return await self._get( - f"/cloud/v3/inference/{project_id}/api_keys/{api_key_name}", + f"/cloud/v3/inference/{project_id}/api_keys/{api_key_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/api_keys/{api_key_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/inference/applications/deployments.py b/src/gcore/resources/cloud/inference/applications/deployments.py index 845bffce..43b6893f 100644 --- a/src/gcore/resources/cloud/inference/applications/deployments.py +++ b/src/gcore/resources/cloud/inference/applications/deployments.py @@ -93,7 +93,9 @@ def create( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._post( - f"/cloud/v3/inference/applications/{project_id}/deployments", + f"/cloud/v3/inference/applications/{project_id}/deployments" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/applications/{project_id}/deployments", body=maybe_transform( { "application_name": application_name, @@ -140,7 +142,9 @@ def list( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._get( - f"/cloud/v3/inference/applications/{project_id}/deployments", + f"/cloud/v3/inference/applications/{project_id}/deployments" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/applications/{project_id}/deployments", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -182,7 +186,9 @@ def delete( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return self._delete( - f"/cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}", + f"/cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -226,7 +232,9 @@ def get( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return self._get( - f"/cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}", + f"/cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -280,7 +288,9 @@ def patch( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return self._patch( - f"/cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}", + f"/cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}", body=maybe_transform( { "api_keys": api_keys, @@ -362,7 +372,9 @@ async def create( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return await self._post( - f"/cloud/v3/inference/applications/{project_id}/deployments", + f"/cloud/v3/inference/applications/{project_id}/deployments" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/applications/{project_id}/deployments", body=await async_maybe_transform( { "application_name": application_name, @@ -409,7 +421,9 @@ async def list( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return await self._get( - f"/cloud/v3/inference/applications/{project_id}/deployments", + f"/cloud/v3/inference/applications/{project_id}/deployments" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/applications/{project_id}/deployments", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -451,7 +465,9 @@ async def delete( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return await self._delete( - f"/cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}", + f"/cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -495,7 +511,9 @@ async def get( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return await self._get( - f"/cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}", + f"/cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -549,7 +567,9 @@ async def patch( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return await self._patch( - f"/cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}", + f"/cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}", body=await async_maybe_transform( { "api_keys": api_keys, diff --git a/src/gcore/resources/cloud/inference/applications/templates.py b/src/gcore/resources/cloud/inference/applications/templates.py index 1c475cb8..664203be 100644 --- a/src/gcore/resources/cloud/inference/applications/templates.py +++ b/src/gcore/resources/cloud/inference/applications/templates.py @@ -58,7 +58,9 @@ def list( required to create a fully functional application deployment. """ return self._get( - "/cloud/v3/inference/applications/catalog", + "/cloud/v3/inference/applications/catalog" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v3/inference/applications/catalog", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -97,7 +99,9 @@ def get( if not application_name: raise ValueError(f"Expected a non-empty value for `application_name` but received {application_name!r}") return self._get( - f"/cloud/v3/inference/applications/catalog/{application_name}", + f"/cloud/v3/inference/applications/catalog/{application_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/applications/catalog/{application_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -143,7 +147,9 @@ async def list( required to create a fully functional application deployment. """ return await self._get( - "/cloud/v3/inference/applications/catalog", + "/cloud/v3/inference/applications/catalog" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v3/inference/applications/catalog", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -182,7 +188,9 @@ async def get( if not application_name: raise ValueError(f"Expected a non-empty value for `application_name` but received {application_name!r}") return await self._get( - f"/cloud/v3/inference/applications/catalog/{application_name}", + f"/cloud/v3/inference/applications/catalog/{application_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/applications/catalog/{application_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/inference/deployments/deployments.py b/src/gcore/resources/cloud/inference/deployments/deployments.py index 533883c2..a652b6fc 100644 --- a/src/gcore/resources/cloud/inference/deployments/deployments.py +++ b/src/gcore/resources/cloud/inference/deployments/deployments.py @@ -147,7 +147,9 @@ def create( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._post( - f"/cloud/v3/inference/{project_id}/deployments", + f"/cloud/v3/inference/{project_id}/deployments" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments", body=maybe_transform( { "containers": containers, @@ -263,7 +265,9 @@ def update( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return self._patch( - f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}", + f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments/{deployment_name}", body=maybe_transform( { "api_keys": api_keys, @@ -325,7 +329,9 @@ def list( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._get_api_list( - f"/cloud/v3/inference/{project_id}/deployments", + f"/cloud/v3/inference/{project_id}/deployments" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments", page=SyncOffsetPage[InferenceDeployment], options=make_request_options( extra_headers=extra_headers, @@ -376,7 +382,9 @@ def delete( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return self._delete( - f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}", + f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments/{deployment_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -416,7 +424,9 @@ def get( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return self._get( - f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}", + f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments/{deployment_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -457,7 +467,9 @@ def get_api_key( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return self._get( - f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/apikey", + f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/apikey" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments/{deployment_name}/apikey", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -505,7 +517,9 @@ def start( raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/start", + f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/start" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments/{deployment_name}/start", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -553,7 +567,9 @@ def stop( raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/stop", + f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/stop" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments/{deployment_name}/stop", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -840,7 +856,9 @@ async def create( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return await self._post( - f"/cloud/v3/inference/{project_id}/deployments", + f"/cloud/v3/inference/{project_id}/deployments" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments", body=await async_maybe_transform( { "containers": containers, @@ -956,7 +974,9 @@ async def update( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return await self._patch( - f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}", + f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments/{deployment_name}", body=await async_maybe_transform( { "api_keys": api_keys, @@ -1018,7 +1038,9 @@ def list( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._get_api_list( - f"/cloud/v3/inference/{project_id}/deployments", + f"/cloud/v3/inference/{project_id}/deployments" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments", page=AsyncOffsetPage[InferenceDeployment], options=make_request_options( extra_headers=extra_headers, @@ -1069,7 +1091,9 @@ async def delete( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return await self._delete( - f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}", + f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments/{deployment_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1109,7 +1133,9 @@ async def get( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return await self._get( - f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}", + f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments/{deployment_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1150,7 +1176,9 @@ async def get_api_key( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return await self._get( - f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/apikey", + f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/apikey" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments/{deployment_name}/apikey", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1198,7 +1226,9 @@ async def start( raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/start", + f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/start" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments/{deployment_name}/start", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1246,7 +1276,9 @@ async def stop( raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/stop", + f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/stop" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments/{deployment_name}/stop", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/inference/deployments/logs.py b/src/gcore/resources/cloud/inference/deployments/logs.py index 1cc65006..2ee0666e 100644 --- a/src/gcore/resources/cloud/inference/deployments/logs.py +++ b/src/gcore/resources/cloud/inference/deployments/logs.py @@ -91,7 +91,9 @@ def list( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return self._get_api_list( - f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/logs", + f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/logs" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments/{deployment_name}/logs", page=SyncOffsetPage[InferenceDeploymentLog], options=make_request_options( extra_headers=extra_headers, @@ -178,7 +180,9 @@ def list( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return self._get_api_list( - f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/logs", + f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/logs" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments/{deployment_name}/logs", page=AsyncOffsetPage[InferenceDeploymentLog], options=make_request_options( extra_headers=extra_headers, diff --git a/src/gcore/resources/cloud/inference/flavors.py b/src/gcore/resources/cloud/inference/flavors.py index d273b19b..8dcc3e62 100644 --- a/src/gcore/resources/cloud/inference/flavors.py +++ b/src/gcore/resources/cloud/inference/flavors.py @@ -73,7 +73,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v3/inference/flavors", + "/cloud/v3/inference/flavors" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v3/inference/flavors", page=SyncOffsetPage[InferenceFlavor], options=make_request_options( extra_headers=extra_headers, @@ -119,7 +121,9 @@ def get( if not flavor_name: raise ValueError(f"Expected a non-empty value for `flavor_name` but received {flavor_name!r}") return self._get( - f"/cloud/v3/inference/flavors/{flavor_name}", + f"/cloud/v3/inference/flavors/{flavor_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/flavors/{flavor_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -178,7 +182,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v3/inference/flavors", + "/cloud/v3/inference/flavors" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v3/inference/flavors", page=AsyncOffsetPage[InferenceFlavor], options=make_request_options( extra_headers=extra_headers, @@ -224,7 +230,9 @@ async def get( if not flavor_name: raise ValueError(f"Expected a non-empty value for `flavor_name` but received {flavor_name!r}") return await self._get( - f"/cloud/v3/inference/flavors/{flavor_name}", + f"/cloud/v3/inference/flavors/{flavor_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/flavors/{flavor_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/inference/inference.py b/src/gcore/resources/cloud/inference/inference.py index 103c70f1..b116b08f 100644 --- a/src/gcore/resources/cloud/inference/inference.py +++ b/src/gcore/resources/cloud/inference/inference.py @@ -123,7 +123,9 @@ def get_capacity_by_region( ) -> InferenceRegionCapacityList: """Get inference capacity by region""" return self._get( - "/cloud/v3/inference/capacity", + "/cloud/v3/inference/capacity" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v3/inference/capacity", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -187,7 +189,9 @@ async def get_capacity_by_region( ) -> InferenceRegionCapacityList: """Get inference capacity by region""" return await self._get( - "/cloud/v3/inference/capacity", + "/cloud/v3/inference/capacity" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v3/inference/capacity", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/inference/registry_credentials.py b/src/gcore/resources/cloud/inference/registry_credentials.py index 6dd78f70..9d5a4072 100644 --- a/src/gcore/resources/cloud/inference/registry_credentials.py +++ b/src/gcore/resources/cloud/inference/registry_credentials.py @@ -86,7 +86,9 @@ def create( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._post( - f"/cloud/v3/inference/{project_id}/registry_credentials", + f"/cloud/v3/inference/{project_id}/registry_credentials" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/registry_credentials", body=maybe_transform( { "name": name, @@ -137,7 +139,9 @@ def list( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._get_api_list( - f"/cloud/v3/inference/{project_id}/registry_credentials", + f"/cloud/v3/inference/{project_id}/registry_credentials" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/registry_credentials", page=SyncOffsetPage[InferenceRegistryCredentials], options=make_request_options( extra_headers=extra_headers, @@ -189,7 +193,9 @@ def delete( raise ValueError(f"Expected a non-empty value for `credential_name` but received {credential_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v3/inference/{project_id}/registry_credentials/{credential_name}", + f"/cloud/v3/inference/{project_id}/registry_credentials/{credential_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/registry_credentials/{credential_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -229,7 +235,9 @@ def get( if not credential_name: raise ValueError(f"Expected a non-empty value for `credential_name` but received {credential_name!r}") return self._get( - f"/cloud/v3/inference/{project_id}/registry_credentials/{credential_name}", + f"/cloud/v3/inference/{project_id}/registry_credentials/{credential_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/registry_credentials/{credential_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -278,7 +286,9 @@ def replace( if not credential_name: raise ValueError(f"Expected a non-empty value for `credential_name` but received {credential_name!r}") return self._put( - f"/cloud/v3/inference/{project_id}/registry_credentials/{credential_name}", + f"/cloud/v3/inference/{project_id}/registry_credentials/{credential_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/registry_credentials/{credential_name}", body=maybe_transform( { "password": password, @@ -354,7 +364,9 @@ async def create( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return await self._post( - f"/cloud/v3/inference/{project_id}/registry_credentials", + f"/cloud/v3/inference/{project_id}/registry_credentials" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/registry_credentials", body=await async_maybe_transform( { "name": name, @@ -405,7 +417,9 @@ def list( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._get_api_list( - f"/cloud/v3/inference/{project_id}/registry_credentials", + f"/cloud/v3/inference/{project_id}/registry_credentials" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/registry_credentials", page=AsyncOffsetPage[InferenceRegistryCredentials], options=make_request_options( extra_headers=extra_headers, @@ -457,7 +471,9 @@ async def delete( raise ValueError(f"Expected a non-empty value for `credential_name` but received {credential_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v3/inference/{project_id}/registry_credentials/{credential_name}", + f"/cloud/v3/inference/{project_id}/registry_credentials/{credential_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/registry_credentials/{credential_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -497,7 +513,9 @@ async def get( if not credential_name: raise ValueError(f"Expected a non-empty value for `credential_name` but received {credential_name!r}") return await self._get( - f"/cloud/v3/inference/{project_id}/registry_credentials/{credential_name}", + f"/cloud/v3/inference/{project_id}/registry_credentials/{credential_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/registry_credentials/{credential_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -546,7 +564,9 @@ async def replace( if not credential_name: raise ValueError(f"Expected a non-empty value for `credential_name` but received {credential_name!r}") return await self._put( - f"/cloud/v3/inference/{project_id}/registry_credentials/{credential_name}", + f"/cloud/v3/inference/{project_id}/registry_credentials/{credential_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/registry_credentials/{credential_name}", body=await async_maybe_transform( { "password": password, diff --git a/src/gcore/resources/cloud/inference/secrets.py b/src/gcore/resources/cloud/inference/secrets.py index 275ec3f2..ed312faa 100644 --- a/src/gcore/resources/cloud/inference/secrets.py +++ b/src/gcore/resources/cloud/inference/secrets.py @@ -79,7 +79,9 @@ def create( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._post( - f"/cloud/v3/inference/{project_id}/secrets", + f"/cloud/v3/inference/{project_id}/secrets" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/secrets", body=maybe_transform( { "data": data, @@ -130,7 +132,9 @@ def list( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._get_api_list( - f"/cloud/v3/inference/{project_id}/secrets", + f"/cloud/v3/inference/{project_id}/secrets" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/secrets", page=SyncOffsetPage[InferenceSecret], options=make_request_options( extra_headers=extra_headers, @@ -182,7 +186,9 @@ def delete( raise ValueError(f"Expected a non-empty value for `secret_name` but received {secret_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v3/inference/{project_id}/secrets/{secret_name}", + f"/cloud/v3/inference/{project_id}/secrets/{secret_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/secrets/{secret_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -222,7 +228,9 @@ def get( if not secret_name: raise ValueError(f"Expected a non-empty value for `secret_name` but received {secret_name!r}") return self._get( - f"/cloud/v3/inference/{project_id}/secrets/{secret_name}", + f"/cloud/v3/inference/{project_id}/secrets/{secret_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/secrets/{secret_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -268,7 +276,9 @@ def replace( if not secret_name: raise ValueError(f"Expected a non-empty value for `secret_name` but received {secret_name!r}") return self._put( - f"/cloud/v3/inference/{project_id}/secrets/{secret_name}", + f"/cloud/v3/inference/{project_id}/secrets/{secret_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/secrets/{secret_name}", body=maybe_transform( { "data": data, @@ -340,7 +350,9 @@ async def create( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return await self._post( - f"/cloud/v3/inference/{project_id}/secrets", + f"/cloud/v3/inference/{project_id}/secrets" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/secrets", body=await async_maybe_transform( { "data": data, @@ -391,7 +403,9 @@ def list( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._get_api_list( - f"/cloud/v3/inference/{project_id}/secrets", + f"/cloud/v3/inference/{project_id}/secrets" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/secrets", page=AsyncOffsetPage[InferenceSecret], options=make_request_options( extra_headers=extra_headers, @@ -443,7 +457,9 @@ async def delete( raise ValueError(f"Expected a non-empty value for `secret_name` but received {secret_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v3/inference/{project_id}/secrets/{secret_name}", + f"/cloud/v3/inference/{project_id}/secrets/{secret_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/secrets/{secret_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -483,7 +499,9 @@ async def get( if not secret_name: raise ValueError(f"Expected a non-empty value for `secret_name` but received {secret_name!r}") return await self._get( - f"/cloud/v3/inference/{project_id}/secrets/{secret_name}", + f"/cloud/v3/inference/{project_id}/secrets/{secret_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/secrets/{secret_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -529,7 +547,9 @@ async def replace( if not secret_name: raise ValueError(f"Expected a non-empty value for `secret_name` but received {secret_name!r}") return await self._put( - f"/cloud/v3/inference/{project_id}/secrets/{secret_name}", + f"/cloud/v3/inference/{project_id}/secrets/{secret_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v3/inference/{project_id}/secrets/{secret_name}", body=await async_maybe_transform( { "data": data, diff --git a/src/gcore/resources/cloud/instances/flavors.py b/src/gcore/resources/cloud/instances/flavors.py index 9bd7f38f..3bf61d85 100644 --- a/src/gcore/resources/cloud/instances/flavors.py +++ b/src/gcore/resources/cloud/instances/flavors.py @@ -85,7 +85,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/flavors/{project_id}/{region_id}", + f"/cloud/v1/flavors/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/flavors/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -169,7 +171,9 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/flavors/{project_id}/{region_id}", + f"/cloud/v1/flavors/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/flavors/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/cloud/instances/images.py b/src/gcore/resources/cloud/instances/images.py index 7b13a49a..b4cdb777 100644 --- a/src/gcore/resources/cloud/instances/images.py +++ b/src/gcore/resources/cloud/instances/images.py @@ -110,7 +110,9 @@ def update( if not image_id: raise ValueError(f"Expected a non-empty value for `image_id` but received {image_id!r}") return self._patch( - f"/cloud/v1/images/{project_id}/{region_id}/{image_id}", + f"/cloud/v1/images/{project_id}/{region_id}/{image_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/images/{project_id}/{region_id}/{image_id}", body=maybe_transform( { "hw_firmware_type": hw_firmware_type, @@ -176,7 +178,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/images/{project_id}/{region_id}", + f"/cloud/v1/images/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/images/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -230,7 +234,9 @@ def delete( if not image_id: raise ValueError(f"Expected a non-empty value for `image_id` but received {image_id!r}") return self._delete( - f"/cloud/v1/images/{project_id}/{region_id}/{image_id}", + f"/cloud/v1/images/{project_id}/{region_id}/{image_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/images/{project_id}/{region_id}/{image_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -336,7 +342,9 @@ def create_from_volume( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/images/{project_id}/{region_id}", + f"/cloud/v1/images/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/images/{project_id}/{region_id}", body=maybe_transform( { "name": name, @@ -453,7 +461,9 @@ def get( if not image_id: raise ValueError(f"Expected a non-empty value for `image_id` but received {image_id!r}") return self._get( - f"/cloud/v1/images/{project_id}/{region_id}/{image_id}", + f"/cloud/v1/images/{project_id}/{region_id}/{image_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/images/{project_id}/{region_id}/{image_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -536,7 +546,9 @@ def upload( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/downloadimage/{project_id}/{region_id}", + f"/cloud/v1/downloadimage/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/downloadimage/{project_id}/{region_id}", body=maybe_transform( { "name": name, @@ -702,7 +714,9 @@ async def update( if not image_id: raise ValueError(f"Expected a non-empty value for `image_id` but received {image_id!r}") return await self._patch( - f"/cloud/v1/images/{project_id}/{region_id}/{image_id}", + f"/cloud/v1/images/{project_id}/{region_id}/{image_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/images/{project_id}/{region_id}/{image_id}", body=await async_maybe_transform( { "hw_firmware_type": hw_firmware_type, @@ -768,7 +782,9 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/images/{project_id}/{region_id}", + f"/cloud/v1/images/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/images/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -822,7 +838,9 @@ async def delete( if not image_id: raise ValueError(f"Expected a non-empty value for `image_id` but received {image_id!r}") return await self._delete( - f"/cloud/v1/images/{project_id}/{region_id}/{image_id}", + f"/cloud/v1/images/{project_id}/{region_id}/{image_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/images/{project_id}/{region_id}/{image_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -928,7 +946,9 @@ async def create_from_volume( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/images/{project_id}/{region_id}", + f"/cloud/v1/images/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/images/{project_id}/{region_id}", body=await async_maybe_transform( { "name": name, @@ -1045,7 +1065,9 @@ async def get( if not image_id: raise ValueError(f"Expected a non-empty value for `image_id` but received {image_id!r}") return await self._get( - f"/cloud/v1/images/{project_id}/{region_id}/{image_id}", + f"/cloud/v1/images/{project_id}/{region_id}/{image_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/images/{project_id}/{region_id}/{image_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1128,7 +1150,9 @@ async def upload( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/downloadimage/{project_id}/{region_id}", + f"/cloud/v1/downloadimage/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/downloadimage/{project_id}/{region_id}", body=await async_maybe_transform( { "name": name, diff --git a/src/gcore/resources/cloud/instances/instances.py b/src/gcore/resources/cloud/instances/instances.py index 6cb7f865..49a07405 100644 --- a/src/gcore/resources/cloud/instances/instances.py +++ b/src/gcore/resources/cloud/instances/instances.py @@ -228,7 +228,9 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v2/instances/{project_id}/{region_id}", + f"/cloud/v2/instances/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/instances/{project_id}/{region_id}", body=maybe_transform( { "flavor": flavor, @@ -365,7 +367,9 @@ def update( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._patch( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}", body=maybe_transform({"name": name}, instance_update_params.InstanceUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -514,7 +518,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/instances/{project_id}/{region_id}", + f"/cloud/v1/instances/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}", page=SyncOffsetPage[Instance], options=make_request_options( extra_headers=extra_headers, @@ -608,7 +614,9 @@ def delete( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._delete( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -759,7 +767,9 @@ def action( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._post( - f"/cloud/v2/instances/{project_id}/{region_id}/{instance_id}/action", + f"/cloud/v2/instances/{project_id}/{region_id}/{instance_id}/action" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/instances/{project_id}/{region_id}/{instance_id}/action", body=maybe_transform( { "action": action, @@ -929,7 +939,9 @@ def add_to_placement_group( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/put_into_servergroup", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/put_into_servergroup" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/put_into_servergroup", body=maybe_transform( {"servergroup_id": servergroup_id}, instance_add_to_placement_group_params.InstanceAddToPlacementGroupParams, @@ -1024,7 +1036,9 @@ def assign_security_group( raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/addsecuritygroup", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/addsecuritygroup" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/addsecuritygroup", body=maybe_transform( { "name": name, @@ -1070,7 +1084,9 @@ def disable_port_security( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return self._post( - f"/cloud/v1/ports/{project_id}/{region_id}/{port_id}/disable_port_security", + f"/cloud/v1/ports/{project_id}/{region_id}/{port_id}/disable_port_security" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ports/{project_id}/{region_id}/{port_id}/disable_port_security", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1109,7 +1125,9 @@ def enable_port_security( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return self._post( - f"/cloud/v1/ports/{project_id}/{region_id}/{port_id}/enable_port_security", + f"/cloud/v1/ports/{project_id}/{region_id}/{port_id}/enable_port_security" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ports/{project_id}/{region_id}/{port_id}/enable_port_security", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1163,7 +1181,9 @@ def get( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._get( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1205,7 +1225,9 @@ def get_console( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._get( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/get_console", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/get_console" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/get_console", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1252,7 +1274,9 @@ def remove_from_placement_group( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/remove_from_servergroup", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/remove_from_servergroup" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/remove_from_servergroup", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1334,7 +1358,9 @@ def resize( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/changeflavor", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/changeflavor" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/changeflavor", body=maybe_transform({"flavor_id": flavor_id}, instance_resize_params.InstanceResizeParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -1426,7 +1452,9 @@ def unassign_security_group( raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/delsecuritygroup", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/delsecuritygroup" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/delsecuritygroup", body=maybe_transform( { "name": name, @@ -1597,7 +1625,9 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v2/instances/{project_id}/{region_id}", + f"/cloud/v2/instances/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/instances/{project_id}/{region_id}", body=await async_maybe_transform( { "flavor": flavor, @@ -1734,7 +1764,9 @@ async def update( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._patch( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}", body=await async_maybe_transform({"name": name}, instance_update_params.InstanceUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -1883,7 +1915,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/instances/{project_id}/{region_id}", + f"/cloud/v1/instances/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}", page=AsyncOffsetPage[Instance], options=make_request_options( extra_headers=extra_headers, @@ -1977,7 +2011,9 @@ async def delete( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._delete( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2128,7 +2164,9 @@ async def action( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._post( - f"/cloud/v2/instances/{project_id}/{region_id}/{instance_id}/action", + f"/cloud/v2/instances/{project_id}/{region_id}/{instance_id}/action" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/instances/{project_id}/{region_id}/{instance_id}/action", body=await async_maybe_transform( { "action": action, @@ -2298,7 +2336,9 @@ async def add_to_placement_group( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/put_into_servergroup", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/put_into_servergroup" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/put_into_servergroup", body=await async_maybe_transform( {"servergroup_id": servergroup_id}, instance_add_to_placement_group_params.InstanceAddToPlacementGroupParams, @@ -2393,7 +2433,9 @@ async def assign_security_group( raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/addsecuritygroup", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/addsecuritygroup" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/addsecuritygroup", body=await async_maybe_transform( { "name": name, @@ -2439,7 +2481,9 @@ async def disable_port_security( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return await self._post( - f"/cloud/v1/ports/{project_id}/{region_id}/{port_id}/disable_port_security", + f"/cloud/v1/ports/{project_id}/{region_id}/{port_id}/disable_port_security" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ports/{project_id}/{region_id}/{port_id}/disable_port_security", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -2478,7 +2522,9 @@ async def enable_port_security( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return await self._post( - f"/cloud/v1/ports/{project_id}/{region_id}/{port_id}/enable_port_security", + f"/cloud/v1/ports/{project_id}/{region_id}/{port_id}/enable_port_security" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ports/{project_id}/{region_id}/{port_id}/enable_port_security", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -2532,7 +2578,9 @@ async def get( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._get( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -2574,7 +2622,9 @@ async def get_console( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._get( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/get_console", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/get_console" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/get_console", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2621,7 +2671,9 @@ async def remove_from_placement_group( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/remove_from_servergroup", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/remove_from_servergroup" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/remove_from_servergroup", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -2703,7 +2755,9 @@ async def resize( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/changeflavor", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/changeflavor" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/changeflavor", body=await async_maybe_transform({"flavor_id": flavor_id}, instance_resize_params.InstanceResizeParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -2795,7 +2849,9 @@ async def unassign_security_group( raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/delsecuritygroup", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/delsecuritygroup" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/delsecuritygroup", body=await async_maybe_transform( { "name": name, diff --git a/src/gcore/resources/cloud/instances/interfaces.py b/src/gcore/resources/cloud/instances/interfaces.py index 5d1c5c35..c2a2a9fd 100644 --- a/src/gcore/resources/cloud/instances/interfaces.py +++ b/src/gcore/resources/cloud/instances/interfaces.py @@ -77,7 +77,9 @@ def list( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._get( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/interfaces", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/interfaces" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/interfaces", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -313,7 +315,9 @@ def attach( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/attach_interface", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/attach_interface" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/attach_interface", body=maybe_transform( { "ddos_profile": ddos_profile, @@ -665,7 +669,9 @@ def detach( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/detach_interface", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/detach_interface" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/detach_interface", body=maybe_transform( { "ip_address": ip_address, @@ -732,7 +738,9 @@ async def list( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._get( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/interfaces", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/interfaces" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/interfaces", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -968,7 +976,9 @@ async def attach( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/attach_interface", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/attach_interface" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/attach_interface", body=await async_maybe_transform( { "ddos_profile": ddos_profile, @@ -1242,7 +1252,9 @@ async def detach( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/detach_interface", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/detach_interface" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/detach_interface", body=await async_maybe_transform( { "ip_address": ip_address, diff --git a/src/gcore/resources/cloud/instances/metrics.py b/src/gcore/resources/cloud/instances/metrics.py index fa058434..03ffbcd1 100644 --- a/src/gcore/resources/cloud/instances/metrics.py +++ b/src/gcore/resources/cloud/instances/metrics.py @@ -87,7 +87,9 @@ def list( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/metrics", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/metrics" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/metrics", body=maybe_transform( { "time_interval": time_interval, @@ -166,7 +168,9 @@ async def list( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/metrics", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/metrics" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/metrics", body=await async_maybe_transform( { "time_interval": time_interval, diff --git a/src/gcore/resources/cloud/ip_ranges.py b/src/gcore/resources/cloud/ip_ranges.py index 12024d04..b0d0c62e 100644 --- a/src/gcore/resources/cloud/ip_ranges.py +++ b/src/gcore/resources/cloud/ip_ranges.py @@ -67,7 +67,9 @@ def list( returned. """ return self._get( - "/cloud/public/v1/ipranges/egress", + "/cloud/public/v1/ipranges/egress" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/public/v1/ipranges/egress", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -123,7 +125,9 @@ async def list( returned. """ return await self._get( - "/cloud/public/v1/ipranges/egress", + "/cloud/public/v1/ipranges/egress" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/public/v1/ipranges/egress", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/k8s/clusters/clusters.py b/src/gcore/resources/cloud/k8s/clusters/clusters.py index a778a3b9..198ead21 100644 --- a/src/gcore/resources/cloud/k8s/clusters/clusters.py +++ b/src/gcore/resources/cloud/k8s/clusters/clusters.py @@ -210,7 +210,9 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}", body=maybe_transform( { "keypair": keypair, @@ -339,7 +341,9 @@ def update( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return self._patch( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}", body=maybe_transform( { "authentication": authentication, @@ -385,7 +389,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -427,7 +433,9 @@ def delete( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return self._delete( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -470,7 +478,9 @@ def get( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -509,7 +519,9 @@ def get_certificate( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/certificates", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/certificates" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/certificates", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -548,7 +560,9 @@ def get_kubeconfig( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/config", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/config" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/config", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -587,7 +601,9 @@ def list_versions_for_upgrade( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/upgrade_versions", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/upgrade_versions" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/upgrade_versions", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -629,7 +645,9 @@ def upgrade( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return self._post( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/upgrade", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/upgrade" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/upgrade", body=maybe_transform({"version": version}, cluster_upgrade_params.ClusterUpgradeParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -799,7 +817,9 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}", body=await async_maybe_transform( { "keypair": keypair, @@ -928,7 +948,9 @@ async def update( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return await self._patch( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}", body=await async_maybe_transform( { "authentication": authentication, @@ -974,7 +996,9 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1016,7 +1040,9 @@ async def delete( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return await self._delete( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1059,7 +1085,9 @@ async def get( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return await self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1098,7 +1126,9 @@ async def get_certificate( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return await self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/certificates", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/certificates" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/certificates", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1137,7 +1167,9 @@ async def get_kubeconfig( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return await self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/config", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/config" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/config", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1176,7 +1208,9 @@ async def list_versions_for_upgrade( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return await self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/upgrade_versions", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/upgrade_versions" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/upgrade_versions", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1218,7 +1252,9 @@ async def upgrade( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return await self._post( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/upgrade", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/upgrade" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/upgrade", body=await async_maybe_transform({"version": version}, cluster_upgrade_params.ClusterUpgradeParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout diff --git a/src/gcore/resources/cloud/k8s/clusters/nodes.py b/src/gcore/resources/cloud/k8s/clusters/nodes.py index b3bd95d8..d04a0586 100644 --- a/src/gcore/resources/cloud/k8s/clusters/nodes.py +++ b/src/gcore/resources/cloud/k8s/clusters/nodes.py @@ -76,7 +76,9 @@ def list( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/instances", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/instances" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/instances", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -124,7 +126,9 @@ def delete( raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/instances/{instance_id}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/instances/{instance_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/instances/{instance_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -187,7 +191,9 @@ async def list( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return await self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/instances", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/instances" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/instances", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -235,7 +241,9 @@ async def delete( raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/instances/{instance_id}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/instances/{instance_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/instances/{instance_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/k8s/clusters/pools/nodes.py b/src/gcore/resources/cloud/k8s/clusters/pools/nodes.py index 903c428e..8ff64793 100644 --- a/src/gcore/resources/cloud/k8s/clusters/pools/nodes.py +++ b/src/gcore/resources/cloud/k8s/clusters/pools/nodes.py @@ -79,7 +79,9 @@ def list( if not pool_name: raise ValueError(f"Expected a non-empty value for `pool_name` but received {pool_name!r}") return self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/instances", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/instances" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/instances", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -130,7 +132,9 @@ def delete( raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/instances/{instance_id}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/instances/{instance_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/instances/{instance_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -196,7 +200,9 @@ async def list( if not pool_name: raise ValueError(f"Expected a non-empty value for `pool_name` but received {pool_name!r}") return await self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/instances", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/instances" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/instances", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -247,7 +253,9 @@ async def delete( raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/instances/{instance_id}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/instances/{instance_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/instances/{instance_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/k8s/clusters/pools/pools.py b/src/gcore/resources/cloud/k8s/clusters/pools/pools.py index 0cb81d5a..b60e3039 100644 --- a/src/gcore/resources/cloud/k8s/clusters/pools/pools.py +++ b/src/gcore/resources/cloud/k8s/clusters/pools/pools.py @@ -130,7 +130,9 @@ def create( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return self._post( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools", body=maybe_transform( { "flavor_id": flavor_id, @@ -208,7 +210,9 @@ def update( if not pool_name: raise ValueError(f"Expected a non-empty value for `pool_name` but received {pool_name!r}") return self._patch( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}", body=maybe_transform( { "auto_healing_enabled": auto_healing_enabled, @@ -258,7 +262,9 @@ def list( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -300,7 +306,9 @@ def delete( if not pool_name: raise ValueError(f"Expected a non-empty value for `pool_name` but received {pool_name!r}") return self._delete( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -342,7 +350,9 @@ def get( if not pool_name: raise ValueError(f"Expected a non-empty value for `pool_name` but received {pool_name!r}") return self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -387,7 +397,9 @@ def resize( if not pool_name: raise ValueError(f"Expected a non-empty value for `pool_name` but received {pool_name!r}") return self._post( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/resize", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/resize" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/resize", body=maybe_transform({"node_count": node_count}, pool_resize_params.PoolResizeParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -492,7 +504,9 @@ async def create( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return await self._post( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools", body=await async_maybe_transform( { "flavor_id": flavor_id, @@ -570,7 +584,9 @@ async def update( if not pool_name: raise ValueError(f"Expected a non-empty value for `pool_name` but received {pool_name!r}") return await self._patch( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}", body=await async_maybe_transform( { "auto_healing_enabled": auto_healing_enabled, @@ -620,7 +636,9 @@ async def list( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return await self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -662,7 +680,9 @@ async def delete( if not pool_name: raise ValueError(f"Expected a non-empty value for `pool_name` but received {pool_name!r}") return await self._delete( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -704,7 +724,9 @@ async def get( if not pool_name: raise ValueError(f"Expected a non-empty value for `pool_name` but received {pool_name!r}") return await self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -749,7 +771,9 @@ async def resize( if not pool_name: raise ValueError(f"Expected a non-empty value for `pool_name` but received {pool_name!r}") return await self._post( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/resize", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/resize" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/resize", body=await async_maybe_transform({"node_count": node_count}, pool_resize_params.PoolResizeParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout diff --git a/src/gcore/resources/cloud/k8s/flavors.py b/src/gcore/resources/cloud/k8s/flavors.py index 71781231..cd456f26 100644 --- a/src/gcore/resources/cloud/k8s/flavors.py +++ b/src/gcore/resources/cloud/k8s/flavors.py @@ -79,7 +79,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/k8s/{project_id}/{region_id}/flavors", + f"/cloud/v1/k8s/{project_id}/{region_id}/flavors" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/k8s/{project_id}/{region_id}/flavors", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -155,7 +157,9 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/k8s/{project_id}/{region_id}/flavors", + f"/cloud/v1/k8s/{project_id}/{region_id}/flavors" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/k8s/{project_id}/{region_id}/flavors", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/cloud/k8s/k8s.py b/src/gcore/resources/cloud/k8s/k8s.py index ad74c5fd..c193fccd 100644 --- a/src/gcore/resources/cloud/k8s/k8s.py +++ b/src/gcore/resources/cloud/k8s/k8s.py @@ -92,7 +92,9 @@ def list_versions( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v2/k8s/{project_id}/{region_id}/create_versions", + f"/cloud/v2/k8s/{project_id}/{region_id}/create_versions" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/{project_id}/{region_id}/create_versions", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -157,7 +159,9 @@ async def list_versions( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v2/k8s/{project_id}/{region_id}/create_versions", + f"/cloud/v2/k8s/{project_id}/{region_id}/create_versions" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/k8s/{project_id}/{region_id}/create_versions", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/load_balancers/flavors.py b/src/gcore/resources/cloud/load_balancers/flavors.py index 48ba2c61..d104d723 100644 --- a/src/gcore/resources/cloud/load_balancers/flavors.py +++ b/src/gcore/resources/cloud/load_balancers/flavors.py @@ -76,7 +76,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/lbflavors/{project_id}/{region_id}", + f"/cloud/v1/lbflavors/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/lbflavors/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -143,7 +145,9 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/lbflavors/{project_id}/{region_id}", + f"/cloud/v1/lbflavors/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/lbflavors/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/cloud/load_balancers/l7_policies/l7_policies.py b/src/gcore/resources/cloud/load_balancers/l7_policies/l7_policies.py index fdecdef4..d956c3e1 100644 --- a/src/gcore/resources/cloud/load_balancers/l7_policies/l7_policies.py +++ b/src/gcore/resources/cloud/load_balancers/l7_policies/l7_policies.py @@ -118,7 +118,9 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/l7policies/{project_id}/{region_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}", body=maybe_transform( { "action": action, @@ -168,7 +170,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/l7policies/{project_id}/{region_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -207,7 +211,9 @@ def delete( if not l7policy_id: raise ValueError(f"Expected a non-empty value for `l7policy_id` but received {l7policy_id!r}") return self._delete( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -246,7 +252,9 @@ def get( if not l7policy_id: raise ValueError(f"Expected a non-empty value for `l7policy_id` but received {l7policy_id!r}") return self._get( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -314,7 +322,9 @@ def replace( if not l7policy_id: raise ValueError(f"Expected a non-empty value for `l7policy_id` but received {l7policy_id!r}") return self._put( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}", body=maybe_transform( { "action": action, @@ -565,7 +575,9 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/l7policies/{project_id}/{region_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}", body=await async_maybe_transform( { "action": action, @@ -615,7 +627,9 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/l7policies/{project_id}/{region_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -654,7 +668,9 @@ async def delete( if not l7policy_id: raise ValueError(f"Expected a non-empty value for `l7policy_id` but received {l7policy_id!r}") return await self._delete( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -693,7 +709,9 @@ async def get( if not l7policy_id: raise ValueError(f"Expected a non-empty value for `l7policy_id` but received {l7policy_id!r}") return await self._get( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -761,7 +779,9 @@ async def replace( if not l7policy_id: raise ValueError(f"Expected a non-empty value for `l7policy_id` but received {l7policy_id!r}") return await self._put( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}", body=await async_maybe_transform( { "action": action, diff --git a/src/gcore/resources/cloud/load_balancers/l7_policies/rules.py b/src/gcore/resources/cloud/load_balancers/l7_policies/rules.py index 626bddc8..f7932093 100644 --- a/src/gcore/resources/cloud/load_balancers/l7_policies/rules.py +++ b/src/gcore/resources/cloud/load_balancers/l7_policies/rules.py @@ -106,7 +106,9 @@ def create( if not l7policy_id: raise ValueError(f"Expected a non-empty value for `l7policy_id` but received {l7policy_id!r}") return self._post( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules", body=maybe_transform( { "compare_type": compare_type, @@ -156,7 +158,9 @@ def list( if not l7policy_id: raise ValueError(f"Expected a non-empty value for `l7policy_id` but received {l7policy_id!r}") return self._get( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -198,7 +202,9 @@ def delete( if not l7rule_id: raise ValueError(f"Expected a non-empty value for `l7rule_id` but received {l7rule_id!r}") return self._delete( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -240,7 +246,9 @@ def get( if not l7rule_id: raise ValueError(f"Expected a non-empty value for `l7rule_id` but received {l7rule_id!r}") return self._get( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -312,7 +320,9 @@ def replace( if not l7rule_id: raise ValueError(f"Expected a non-empty value for `l7rule_id` but received {l7rule_id!r}") return self._put( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}", body=maybe_transform( { "compare_type": compare_type, @@ -575,7 +585,9 @@ async def create( if not l7policy_id: raise ValueError(f"Expected a non-empty value for `l7policy_id` but received {l7policy_id!r}") return await self._post( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules", body=await async_maybe_transform( { "compare_type": compare_type, @@ -625,7 +637,9 @@ async def list( if not l7policy_id: raise ValueError(f"Expected a non-empty value for `l7policy_id` but received {l7policy_id!r}") return await self._get( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -667,7 +681,9 @@ async def delete( if not l7rule_id: raise ValueError(f"Expected a non-empty value for `l7rule_id` but received {l7rule_id!r}") return await self._delete( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -709,7 +725,9 @@ async def get( if not l7rule_id: raise ValueError(f"Expected a non-empty value for `l7rule_id` but received {l7rule_id!r}") return await self._get( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -781,7 +799,9 @@ async def replace( if not l7rule_id: raise ValueError(f"Expected a non-empty value for `l7rule_id` but received {l7rule_id!r}") return await self._put( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}", body=await async_maybe_transform( { "compare_type": compare_type, diff --git a/src/gcore/resources/cloud/load_balancers/listeners.py b/src/gcore/resources/cloud/load_balancers/listeners.py index 729fe7fe..91bf23e0 100644 --- a/src/gcore/resources/cloud/load_balancers/listeners.py +++ b/src/gcore/resources/cloud/load_balancers/listeners.py @@ -127,7 +127,9 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/lblisteners/{project_id}/{region_id}", + f"/cloud/v1/lblisteners/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/lblisteners/{project_id}/{region_id}", body=maybe_transform( { "loadbalancer_id": loadbalancer_id, @@ -219,7 +221,9 @@ def update( if not listener_id: raise ValueError(f"Expected a non-empty value for `listener_id` but received {listener_id!r}") return self._patch( - f"/cloud/v2/lblisteners/{project_id}/{region_id}/{listener_id}", + f"/cloud/v2/lblisteners/{project_id}/{region_id}/{listener_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/lblisteners/{project_id}/{region_id}/{listener_id}", body=maybe_transform( { "allowed_cidrs": allowed_cidrs, @@ -279,7 +283,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/lblisteners/{project_id}/{region_id}", + f"/cloud/v1/lblisteners/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/lblisteners/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -334,7 +340,9 @@ def delete( if not listener_id: raise ValueError(f"Expected a non-empty value for `listener_id` but received {listener_id!r}") return self._delete( - f"/cloud/v1/lblisteners/{project_id}/{region_id}/{listener_id}", + f"/cloud/v1/lblisteners/{project_id}/{region_id}/{listener_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/lblisteners/{project_id}/{region_id}/{listener_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -382,7 +390,9 @@ def get( if not listener_id: raise ValueError(f"Expected a non-empty value for `listener_id` but received {listener_id!r}") return self._get( - f"/cloud/v1/lblisteners/{project_id}/{region_id}/{listener_id}", + f"/cloud/v1/lblisteners/{project_id}/{region_id}/{listener_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/lblisteners/{project_id}/{region_id}/{listener_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -650,7 +660,9 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/lblisteners/{project_id}/{region_id}", + f"/cloud/v1/lblisteners/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/lblisteners/{project_id}/{region_id}", body=await async_maybe_transform( { "loadbalancer_id": loadbalancer_id, @@ -742,7 +754,9 @@ async def update( if not listener_id: raise ValueError(f"Expected a non-empty value for `listener_id` but received {listener_id!r}") return await self._patch( - f"/cloud/v2/lblisteners/{project_id}/{region_id}/{listener_id}", + f"/cloud/v2/lblisteners/{project_id}/{region_id}/{listener_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/lblisteners/{project_id}/{region_id}/{listener_id}", body=await async_maybe_transform( { "allowed_cidrs": allowed_cidrs, @@ -802,7 +816,9 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/lblisteners/{project_id}/{region_id}", + f"/cloud/v1/lblisteners/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/lblisteners/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -857,7 +873,9 @@ async def delete( if not listener_id: raise ValueError(f"Expected a non-empty value for `listener_id` but received {listener_id!r}") return await self._delete( - f"/cloud/v1/lblisteners/{project_id}/{region_id}/{listener_id}", + f"/cloud/v1/lblisteners/{project_id}/{region_id}/{listener_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/lblisteners/{project_id}/{region_id}/{listener_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -905,7 +923,9 @@ async def get( if not listener_id: raise ValueError(f"Expected a non-empty value for `listener_id` but received {listener_id!r}") return await self._get( - f"/cloud/v1/lblisteners/{project_id}/{region_id}/{listener_id}", + f"/cloud/v1/lblisteners/{project_id}/{region_id}/{listener_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/lblisteners/{project_id}/{region_id}/{listener_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/cloud/load_balancers/load_balancers.py b/src/gcore/resources/cloud/load_balancers/load_balancers.py index 9f5f7bce..9268ec81 100644 --- a/src/gcore/resources/cloud/load_balancers/load_balancers.py +++ b/src/gcore/resources/cloud/load_balancers/load_balancers.py @@ -207,7 +207,9 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}", body=maybe_transform( { "flavor": flavor, @@ -297,7 +299,9 @@ def update( if not loadbalancer_id: raise ValueError(f"Expected a non-empty value for `loadbalancer_id` but received {loadbalancer_id!r}") return self._patch( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}", body=maybe_transform( { "logging": logging, @@ -375,7 +379,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}", page=SyncOffsetPage[LoadBalancer], options=make_request_options( extra_headers=extra_headers, @@ -433,7 +439,9 @@ def delete( if not loadbalancer_id: raise ValueError(f"Expected a non-empty value for `loadbalancer_id` but received {loadbalancer_id!r}") return self._delete( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -475,7 +483,9 @@ def failover( if not loadbalancer_id: raise ValueError(f"Expected a non-empty value for `loadbalancer_id` but received {loadbalancer_id!r}") return self._post( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/failover", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/failover" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/failover", body=maybe_transform({"force": force}, load_balancer_failover_params.LoadBalancerFailoverParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -521,7 +531,9 @@ def get( if not loadbalancer_id: raise ValueError(f"Expected a non-empty value for `loadbalancer_id` but received {loadbalancer_id!r}") return self._get( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -573,7 +585,9 @@ def resize( if not loadbalancer_id: raise ValueError(f"Expected a non-empty value for `loadbalancer_id` but received {loadbalancer_id!r}") return self._post( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/resize", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/resize" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/resize", body=maybe_transform({"flavor": flavor}, load_balancer_resize_params.LoadBalancerResizeParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -890,7 +904,9 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}", body=await async_maybe_transform( { "flavor": flavor, @@ -980,7 +996,9 @@ async def update( if not loadbalancer_id: raise ValueError(f"Expected a non-empty value for `loadbalancer_id` but received {loadbalancer_id!r}") return await self._patch( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}", body=await async_maybe_transform( { "logging": logging, @@ -1058,7 +1076,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}", page=AsyncOffsetPage[LoadBalancer], options=make_request_options( extra_headers=extra_headers, @@ -1116,7 +1136,9 @@ async def delete( if not loadbalancer_id: raise ValueError(f"Expected a non-empty value for `loadbalancer_id` but received {loadbalancer_id!r}") return await self._delete( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1158,7 +1180,9 @@ async def failover( if not loadbalancer_id: raise ValueError(f"Expected a non-empty value for `loadbalancer_id` but received {loadbalancer_id!r}") return await self._post( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/failover", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/failover" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/failover", body=await async_maybe_transform( {"force": force}, load_balancer_failover_params.LoadBalancerFailoverParams ), @@ -1206,7 +1230,9 @@ async def get( if not loadbalancer_id: raise ValueError(f"Expected a non-empty value for `loadbalancer_id` but received {loadbalancer_id!r}") return await self._get( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1258,7 +1284,9 @@ async def resize( if not loadbalancer_id: raise ValueError(f"Expected a non-empty value for `loadbalancer_id` but received {loadbalancer_id!r}") return await self._post( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/resize", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/resize" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/resize", body=await async_maybe_transform({"flavor": flavor}, load_balancer_resize_params.LoadBalancerResizeParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout diff --git a/src/gcore/resources/cloud/load_balancers/metrics.py b/src/gcore/resources/cloud/load_balancers/metrics.py index 59df8038..dd0dedd2 100644 --- a/src/gcore/resources/cloud/load_balancers/metrics.py +++ b/src/gcore/resources/cloud/load_balancers/metrics.py @@ -81,7 +81,9 @@ def list( if not loadbalancer_id: raise ValueError(f"Expected a non-empty value for `loadbalancer_id` but received {loadbalancer_id!r}") return self._post( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/metrics", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/metrics" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/metrics", body=maybe_transform( { "time_interval": time_interval, @@ -154,7 +156,9 @@ async def list( if not loadbalancer_id: raise ValueError(f"Expected a non-empty value for `loadbalancer_id` but received {loadbalancer_id!r}") return await self._post( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/metrics", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/metrics" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/metrics", body=await async_maybe_transform( { "time_interval": time_interval, diff --git a/src/gcore/resources/cloud/load_balancers/pools/health_monitors.py b/src/gcore/resources/cloud/load_balancers/pools/health_monitors.py index bae1858c..417ae8b0 100644 --- a/src/gcore/resources/cloud/load_balancers/pools/health_monitors.py +++ b/src/gcore/resources/cloud/load_balancers/pools/health_monitors.py @@ -115,7 +115,9 @@ def create( if not pool_id: raise ValueError(f"Expected a non-empty value for `pool_id` but received {pool_id!r}") return self._post( - f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/healthmonitor", + f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/healthmonitor" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/healthmonitor", body=maybe_transform( { "delay": delay, @@ -177,7 +179,9 @@ def delete( raise ValueError(f"Expected a non-empty value for `pool_id` but received {pool_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/healthmonitor", + f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/healthmonitor" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/healthmonitor", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -274,7 +278,9 @@ async def create( if not pool_id: raise ValueError(f"Expected a non-empty value for `pool_id` but received {pool_id!r}") return await self._post( - f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/healthmonitor", + f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/healthmonitor" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/healthmonitor", body=await async_maybe_transform( { "delay": delay, @@ -336,7 +342,9 @@ async def delete( raise ValueError(f"Expected a non-empty value for `pool_id` but received {pool_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/healthmonitor", + f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/healthmonitor" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/healthmonitor", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/load_balancers/pools/members.py b/src/gcore/resources/cloud/load_balancers/pools/members.py index 05091a8b..37faaa3a 100644 --- a/src/gcore/resources/cloud/load_balancers/pools/members.py +++ b/src/gcore/resources/cloud/load_balancers/pools/members.py @@ -131,7 +131,9 @@ def add( if not pool_id: raise ValueError(f"Expected a non-empty value for `pool_id` but received {pool_id!r}") return self._post( - f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/member", + f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/member" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/member", body=maybe_transform( { "address": address, @@ -195,7 +197,9 @@ def remove( if not member_id: raise ValueError(f"Expected a non-empty value for `member_id` but received {member_id!r}") return self._delete( - f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/member/{member_id}", + f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/member/{member_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/member/{member_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -311,7 +315,9 @@ async def add( if not pool_id: raise ValueError(f"Expected a non-empty value for `pool_id` but received {pool_id!r}") return await self._post( - f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/member", + f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/member" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/member", body=await async_maybe_transform( { "address": address, @@ -375,7 +381,9 @@ async def remove( if not member_id: raise ValueError(f"Expected a non-empty value for `member_id` but received {member_id!r}") return await self._delete( - f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/member/{member_id}", + f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/member/{member_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/member/{member_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/load_balancers/pools/pools.py b/src/gcore/resources/cloud/load_balancers/pools/pools.py index e15c696f..68f8f7d1 100644 --- a/src/gcore/resources/cloud/load_balancers/pools/pools.py +++ b/src/gcore/resources/cloud/load_balancers/pools/pools.py @@ -147,7 +147,9 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/lbpools/{project_id}/{region_id}", + f"/cloud/v1/lbpools/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}", body=maybe_transform( { "lb_algorithm": lb_algorithm, @@ -262,7 +264,9 @@ def update( if not pool_id: raise ValueError(f"Expected a non-empty value for `pool_id` but received {pool_id!r}") return self._patch( - f"/cloud/v2/lbpools/{project_id}/{region_id}/{pool_id}", + f"/cloud/v2/lbpools/{project_id}/{region_id}/{pool_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/lbpools/{project_id}/{region_id}/{pool_id}", body=maybe_transform( { "ca_secret_id": ca_secret_id, @@ -328,7 +332,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/lbpools/{project_id}/{region_id}", + f"/cloud/v1/lbpools/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -384,7 +390,9 @@ def delete( if not pool_id: raise ValueError(f"Expected a non-empty value for `pool_id` but received {pool_id!r}") return self._delete( - f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}", + f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -429,7 +437,9 @@ def get( if not pool_id: raise ValueError(f"Expected a non-empty value for `pool_id` but received {pool_id!r}") return self._get( - f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}", + f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -705,7 +715,9 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/lbpools/{project_id}/{region_id}", + f"/cloud/v1/lbpools/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}", body=await async_maybe_transform( { "lb_algorithm": lb_algorithm, @@ -820,7 +832,9 @@ async def update( if not pool_id: raise ValueError(f"Expected a non-empty value for `pool_id` but received {pool_id!r}") return await self._patch( - f"/cloud/v2/lbpools/{project_id}/{region_id}/{pool_id}", + f"/cloud/v2/lbpools/{project_id}/{region_id}/{pool_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/lbpools/{project_id}/{region_id}/{pool_id}", body=await async_maybe_transform( { "ca_secret_id": ca_secret_id, @@ -886,7 +900,9 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/lbpools/{project_id}/{region_id}", + f"/cloud/v1/lbpools/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -942,7 +958,9 @@ async def delete( if not pool_id: raise ValueError(f"Expected a non-empty value for `pool_id` but received {pool_id!r}") return await self._delete( - f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}", + f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -987,7 +1005,9 @@ async def get( if not pool_id: raise ValueError(f"Expected a non-empty value for `pool_id` but received {pool_id!r}") return await self._get( - f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}", + f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/load_balancers/statuses.py b/src/gcore/resources/cloud/load_balancers/statuses.py index 5579e857..e99f90c9 100644 --- a/src/gcore/resources/cloud/load_balancers/statuses.py +++ b/src/gcore/resources/cloud/load_balancers/statuses.py @@ -69,7 +69,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/status", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/status" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/status", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -108,7 +110,9 @@ def get( if not loadbalancer_id: raise ValueError(f"Expected a non-empty value for `loadbalancer_id` but received {loadbalancer_id!r}") return self._get( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/status", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/status" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/status", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -165,7 +169,9 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/status", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/status" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/status", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -204,7 +210,9 @@ async def get( if not loadbalancer_id: raise ValueError(f"Expected a non-empty value for `loadbalancer_id` but received {loadbalancer_id!r}") return await self._get( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/status", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/status" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/status", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/networks/networks.py b/src/gcore/resources/cloud/networks/networks.py index 09de9d55..8a5a1869 100644 --- a/src/gcore/resources/cloud/networks/networks.py +++ b/src/gcore/resources/cloud/networks/networks.py @@ -120,7 +120,9 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/networks/{project_id}/{region_id}", + f"/cloud/v1/networks/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/networks/{project_id}/{region_id}", body=maybe_transform( { "name": name, @@ -251,7 +253,9 @@ def update( if not network_id: raise ValueError(f"Expected a non-empty value for `network_id` but received {network_id!r}") return self._patch( - f"/cloud/v1/networks/{project_id}/{region_id}/{network_id}", + f"/cloud/v1/networks/{project_id}/{region_id}/{network_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/networks/{project_id}/{region_id}/{network_id}", body=maybe_transform( { "name": name, @@ -318,7 +322,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/networks/{project_id}/{region_id}", + f"/cloud/v1/networks/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/networks/{project_id}/{region_id}", page=SyncOffsetPage[Network], options=make_request_options( extra_headers=extra_headers, @@ -378,7 +384,9 @@ def delete( if not network_id: raise ValueError(f"Expected a non-empty value for `network_id` but received {network_id!r}") return self._delete( - f"/cloud/v1/networks/{project_id}/{region_id}/{network_id}", + f"/cloud/v1/networks/{project_id}/{region_id}/{network_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/networks/{project_id}/{region_id}/{network_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -455,7 +463,9 @@ def get( if not network_id: raise ValueError(f"Expected a non-empty value for `network_id` but received {network_id!r}") return self._get( - f"/cloud/v1/networks/{project_id}/{region_id}/{network_id}", + f"/cloud/v1/networks/{project_id}/{region_id}/{network_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/networks/{project_id}/{region_id}/{network_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -540,7 +550,9 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/networks/{project_id}/{region_id}", + f"/cloud/v1/networks/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/networks/{project_id}/{region_id}", body=await async_maybe_transform( { "name": name, @@ -671,7 +683,9 @@ async def update( if not network_id: raise ValueError(f"Expected a non-empty value for `network_id` but received {network_id!r}") return await self._patch( - f"/cloud/v1/networks/{project_id}/{region_id}/{network_id}", + f"/cloud/v1/networks/{project_id}/{region_id}/{network_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/networks/{project_id}/{region_id}/{network_id}", body=await async_maybe_transform( { "name": name, @@ -738,7 +752,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/networks/{project_id}/{region_id}", + f"/cloud/v1/networks/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/networks/{project_id}/{region_id}", page=AsyncOffsetPage[Network], options=make_request_options( extra_headers=extra_headers, @@ -798,7 +814,9 @@ async def delete( if not network_id: raise ValueError(f"Expected a non-empty value for `network_id` but received {network_id!r}") return await self._delete( - f"/cloud/v1/networks/{project_id}/{region_id}/{network_id}", + f"/cloud/v1/networks/{project_id}/{region_id}/{network_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/networks/{project_id}/{region_id}/{network_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -875,7 +893,9 @@ async def get( if not network_id: raise ValueError(f"Expected a non-empty value for `network_id` but received {network_id!r}") return await self._get( - f"/cloud/v1/networks/{project_id}/{region_id}/{network_id}", + f"/cloud/v1/networks/{project_id}/{region_id}/{network_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/networks/{project_id}/{region_id}/{network_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/networks/routers.py b/src/gcore/resources/cloud/networks/routers.py index 657982bd..93596051 100644 --- a/src/gcore/resources/cloud/networks/routers.py +++ b/src/gcore/resources/cloud/networks/routers.py @@ -92,7 +92,9 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/routers/{project_id}/{region_id}", + f"/cloud/v1/routers/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/routers/{project_id}/{region_id}", body=maybe_transform( { "name": name, @@ -149,7 +151,9 @@ def update( if not router_id: raise ValueError(f"Expected a non-empty value for `router_id` but received {router_id!r}") return self._patch( - f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}", + f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/routers/{project_id}/{region_id}/{router_id}", body=maybe_transform( { "external_gateway_info": external_gateway_info, @@ -199,7 +203,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/routers/{project_id}/{region_id}", + f"/cloud/v1/routers/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/routers/{project_id}/{region_id}", page=SyncOffsetPage[Router], options=make_request_options( extra_headers=extra_headers, @@ -249,7 +255,9 @@ def delete( if not router_id: raise ValueError(f"Expected a non-empty value for `router_id` but received {router_id!r}") return self._delete( - f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}", + f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/routers/{project_id}/{region_id}/{router_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -301,7 +309,9 @@ def attach_subnet( if not router_id: raise ValueError(f"Expected a non-empty value for `router_id` but received {router_id!r}") return self._post( - f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}/attach", + f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}/attach" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/routers/{project_id}/{region_id}/{router_id}/attach", body=maybe_transform( { "subnet_id": subnet_id, @@ -350,7 +360,9 @@ def detach_subnet( if not router_id: raise ValueError(f"Expected a non-empty value for `router_id` but received {router_id!r}") return self._post( - f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}/detach", + f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}/detach" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/routers/{project_id}/{region_id}/{router_id}/detach", body=maybe_transform({"subnet_id": subnet_id}, router_detach_subnet_params.RouterDetachSubnetParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -390,7 +402,9 @@ def get( if not router_id: raise ValueError(f"Expected a non-empty value for `router_id` but received {router_id!r}") return self._get( - f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}", + f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/routers/{project_id}/{region_id}/{router_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -459,7 +473,9 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/routers/{project_id}/{region_id}", + f"/cloud/v1/routers/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/routers/{project_id}/{region_id}", body=await async_maybe_transform( { "name": name, @@ -516,7 +532,9 @@ async def update( if not router_id: raise ValueError(f"Expected a non-empty value for `router_id` but received {router_id!r}") return await self._patch( - f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}", + f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/routers/{project_id}/{region_id}/{router_id}", body=await async_maybe_transform( { "external_gateway_info": external_gateway_info, @@ -566,7 +584,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/routers/{project_id}/{region_id}", + f"/cloud/v1/routers/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/routers/{project_id}/{region_id}", page=AsyncOffsetPage[Router], options=make_request_options( extra_headers=extra_headers, @@ -616,7 +636,9 @@ async def delete( if not router_id: raise ValueError(f"Expected a non-empty value for `router_id` but received {router_id!r}") return await self._delete( - f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}", + f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/routers/{project_id}/{region_id}/{router_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -668,7 +690,9 @@ async def attach_subnet( if not router_id: raise ValueError(f"Expected a non-empty value for `router_id` but received {router_id!r}") return await self._post( - f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}/attach", + f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}/attach" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/routers/{project_id}/{region_id}/{router_id}/attach", body=await async_maybe_transform( { "subnet_id": subnet_id, @@ -717,7 +741,9 @@ async def detach_subnet( if not router_id: raise ValueError(f"Expected a non-empty value for `router_id` but received {router_id!r}") return await self._post( - f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}/detach", + f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}/detach" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/routers/{project_id}/{region_id}/{router_id}/detach", body=await async_maybe_transform( {"subnet_id": subnet_id}, router_detach_subnet_params.RouterDetachSubnetParams ), @@ -759,7 +785,9 @@ async def get( if not router_id: raise ValueError(f"Expected a non-empty value for `router_id` but received {router_id!r}") return await self._get( - f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}", + f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/routers/{project_id}/{region_id}/{router_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/networks/subnets.py b/src/gcore/resources/cloud/networks/subnets.py index 1b66df06..53b7c068 100644 --- a/src/gcore/resources/cloud/networks/subnets.py +++ b/src/gcore/resources/cloud/networks/subnets.py @@ -125,7 +125,9 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/subnets/{project_id}/{region_id}", + f"/cloud/v1/subnets/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/subnets/{project_id}/{region_id}", body=maybe_transform( { "cidr": cidr, @@ -285,7 +287,9 @@ def update( if not subnet_id: raise ValueError(f"Expected a non-empty value for `subnet_id` but received {subnet_id!r}") return self._patch( - f"/cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}", + f"/cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}", body=maybe_transform( { "dns_nameservers": dns_nameservers, @@ -371,7 +375,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/subnets/{project_id}/{region_id}", + f"/cloud/v1/subnets/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/subnets/{project_id}/{region_id}", page=SyncOffsetPage[Subnet], options=make_request_options( extra_headers=extra_headers, @@ -432,7 +438,9 @@ def delete( raise ValueError(f"Expected a non-empty value for `subnet_id` but received {subnet_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}", + f"/cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -477,7 +485,9 @@ def get( if not subnet_id: raise ValueError(f"Expected a non-empty value for `subnet_id` but received {subnet_id!r}") return self._get( - f"/cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}", + f"/cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -581,7 +591,9 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/subnets/{project_id}/{region_id}", + f"/cloud/v1/subnets/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/subnets/{project_id}/{region_id}", body=await async_maybe_transform( { "cidr": cidr, @@ -741,7 +753,9 @@ async def update( if not subnet_id: raise ValueError(f"Expected a non-empty value for `subnet_id` but received {subnet_id!r}") return await self._patch( - f"/cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}", + f"/cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}", body=await async_maybe_transform( { "dns_nameservers": dns_nameservers, @@ -827,7 +841,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/subnets/{project_id}/{region_id}", + f"/cloud/v1/subnets/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/subnets/{project_id}/{region_id}", page=AsyncOffsetPage[Subnet], options=make_request_options( extra_headers=extra_headers, @@ -888,7 +904,9 @@ async def delete( raise ValueError(f"Expected a non-empty value for `subnet_id` but received {subnet_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}", + f"/cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -933,7 +951,9 @@ async def get( if not subnet_id: raise ValueError(f"Expected a non-empty value for `subnet_id` but received {subnet_id!r}") return await self._get( - f"/cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}", + f"/cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/placement_groups.py b/src/gcore/resources/cloud/placement_groups.py index 31777c13..4c3a5142 100644 --- a/src/gcore/resources/cloud/placement_groups.py +++ b/src/gcore/resources/cloud/placement_groups.py @@ -80,7 +80,9 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/servergroups/{project_id}/{region_id}", + f"/cloud/v1/servergroups/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/servergroups/{project_id}/{region_id}", body=maybe_transform( { "name": name, @@ -123,7 +125,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/servergroups/{project_id}/{region_id}", + f"/cloud/v1/servergroups/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/servergroups/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -162,7 +166,9 @@ def delete( if not group_id: raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") return self._delete( - f"/cloud/v1/servergroups/{project_id}/{region_id}/{group_id}", + f"/cloud/v1/servergroups/{project_id}/{region_id}/{group_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/servergroups/{project_id}/{region_id}/{group_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -201,7 +207,9 @@ def get( if not group_id: raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") return self._get( - f"/cloud/v1/servergroups/{project_id}/{region_id}/{group_id}", + f"/cloud/v1/servergroups/{project_id}/{region_id}/{group_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/servergroups/{project_id}/{region_id}/{group_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -264,7 +272,9 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/servergroups/{project_id}/{region_id}", + f"/cloud/v1/servergroups/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/servergroups/{project_id}/{region_id}", body=await async_maybe_transform( { "name": name, @@ -307,7 +317,9 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/servergroups/{project_id}/{region_id}", + f"/cloud/v1/servergroups/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/servergroups/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -346,7 +358,9 @@ async def delete( if not group_id: raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") return await self._delete( - f"/cloud/v1/servergroups/{project_id}/{region_id}/{group_id}", + f"/cloud/v1/servergroups/{project_id}/{region_id}/{group_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/servergroups/{project_id}/{region_id}/{group_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -385,7 +399,9 @@ async def get( if not group_id: raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") return await self._get( - f"/cloud/v1/servergroups/{project_id}/{region_id}/{group_id}", + f"/cloud/v1/servergroups/{project_id}/{region_id}/{group_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/servergroups/{project_id}/{region_id}/{group_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/projects.py b/src/gcore/resources/cloud/projects.py index 383f3c3b..0603b072 100644 --- a/src/gcore/resources/cloud/projects.py +++ b/src/gcore/resources/cloud/projects.py @@ -83,7 +83,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/cloud/v1/projects", + "/cloud/v1/projects" if self._client._base_url_overridden else "https://api.gcore.com//cloud/v1/projects", body=maybe_transform( { "name": name, @@ -142,7 +142,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v1/projects", + "/cloud/v1/projects" if self._client._base_url_overridden else "https://api.gcore.com//cloud/v1/projects", page=SyncOffsetPage[Project], options=make_request_options( extra_headers=extra_headers, @@ -193,7 +193,9 @@ def delete( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._delete( - f"/cloud/v1/projects/{project_id}", + f"/cloud/v1/projects/{project_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/projects/{project_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -226,7 +228,9 @@ def get( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._get( - f"/cloud/v1/projects/{project_id}", + f"/cloud/v1/projects/{project_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/projects/{project_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -267,7 +271,9 @@ def replace( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._put( - f"/cloud/v1/projects/{project_id}", + f"/cloud/v1/projects/{project_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/projects/{project_id}", body=maybe_transform( { "name": name, @@ -339,7 +345,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/cloud/v1/projects", + "/cloud/v1/projects" if self._client._base_url_overridden else "https://api.gcore.com//cloud/v1/projects", body=await async_maybe_transform( { "name": name, @@ -398,7 +404,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v1/projects", + "/cloud/v1/projects" if self._client._base_url_overridden else "https://api.gcore.com//cloud/v1/projects", page=AsyncOffsetPage[Project], options=make_request_options( extra_headers=extra_headers, @@ -449,7 +455,9 @@ async def delete( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return await self._delete( - f"/cloud/v1/projects/{project_id}", + f"/cloud/v1/projects/{project_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/projects/{project_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -482,7 +490,9 @@ async def get( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return await self._get( - f"/cloud/v1/projects/{project_id}", + f"/cloud/v1/projects/{project_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/projects/{project_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -523,7 +533,9 @@ async def replace( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return await self._put( - f"/cloud/v1/projects/{project_id}", + f"/cloud/v1/projects/{project_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/projects/{project_id}", body=await async_maybe_transform( { "name": name, diff --git a/src/gcore/resources/cloud/quotas/quotas.py b/src/gcore/resources/cloud/quotas/quotas.py index 9a9f9c82..17a7d75a 100644 --- a/src/gcore/resources/cloud/quotas/quotas.py +++ b/src/gcore/resources/cloud/quotas/quotas.py @@ -65,7 +65,9 @@ def get_all( ) -> QuotaGetAllResponse: """Get combined client quotas, including both regional and global quotas.""" return self._get( - "/cloud/v2/client_quotas", + "/cloud/v2/client_quotas" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v2/client_quotas", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -103,7 +105,9 @@ def get_by_region( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v2/regional_quotas/{client_id}/{region_id}", + f"/cloud/v2/regional_quotas/{client_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/regional_quotas/{client_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -136,7 +140,9 @@ def get_global( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/cloud/v2/global_quotas/{client_id}", + f"/cloud/v2/global_quotas/{client_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/global_quotas/{client_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -180,7 +186,9 @@ async def get_all( ) -> QuotaGetAllResponse: """Get combined client quotas, including both regional and global quotas.""" return await self._get( - "/cloud/v2/client_quotas", + "/cloud/v2/client_quotas" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v2/client_quotas", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -218,7 +226,9 @@ async def get_by_region( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v2/regional_quotas/{client_id}/{region_id}", + f"/cloud/v2/regional_quotas/{client_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/regional_quotas/{client_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -251,7 +261,9 @@ async def get_global( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/cloud/v2/global_quotas/{client_id}", + f"/cloud/v2/global_quotas/{client_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/global_quotas/{client_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/quotas/requests.py b/src/gcore/resources/cloud/quotas/requests.py index 79d4febe..4c49c8b0 100644 --- a/src/gcore/resources/cloud/quotas/requests.py +++ b/src/gcore/resources/cloud/quotas/requests.py @@ -79,7 +79,9 @@ def create( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - "/cloud/v2/limits_request", + "/cloud/v2/limits_request" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v2/limits_request", body=maybe_transform( { "description": description, @@ -127,7 +129,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v2/limits_request", + "/cloud/v2/limits_request" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v2/limits_request", page=SyncOffsetPage[RequestListResponse], options=make_request_options( extra_headers=extra_headers, @@ -173,7 +177,9 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v2/limits_request/{request_id}", + f"/cloud/v2/limits_request/{request_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/limits_request/{request_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -206,7 +212,9 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/cloud/v2/limits_request/{request_id}", + f"/cloud/v2/limits_request/{request_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/limits_request/{request_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -267,7 +275,9 @@ async def create( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - "/cloud/v2/limits_request", + "/cloud/v2/limits_request" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v2/limits_request", body=await async_maybe_transform( { "description": description, @@ -315,7 +325,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v2/limits_request", + "/cloud/v2/limits_request" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v2/limits_request", page=AsyncOffsetPage[RequestListResponse], options=make_request_options( extra_headers=extra_headers, @@ -361,7 +373,9 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v2/limits_request/{request_id}", + f"/cloud/v2/limits_request/{request_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/limits_request/{request_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -394,7 +408,9 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/cloud/v2/limits_request/{request_id}", + f"/cloud/v2/limits_request/{request_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/limits_request/{request_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/regions.py b/src/gcore/resources/cloud/regions.py index b49adfcd..df9da044 100644 --- a/src/gcore/resources/cloud/regions.py +++ b/src/gcore/resources/cloud/regions.py @@ -86,7 +86,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v1/regions", + "/cloud/v1/regions" if self._client._base_url_overridden else "https://api.gcore.com//cloud/v1/regions", page=SyncOffsetPage[Region], options=make_request_options( extra_headers=extra_headers, @@ -139,7 +139,9 @@ def get( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/regions/{region_id}", + f"/cloud/v1/regions/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/regions/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -213,7 +215,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v1/regions", + "/cloud/v1/regions" if self._client._base_url_overridden else "https://api.gcore.com//cloud/v1/regions", page=AsyncOffsetPage[Region], options=make_request_options( extra_headers=extra_headers, @@ -266,7 +268,9 @@ async def get( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/regions/{region_id}", + f"/cloud/v1/regions/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/regions/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/cloud/registries/artifacts.py b/src/gcore/resources/cloud/registries/artifacts.py index 0b579ba5..77496af1 100644 --- a/src/gcore/resources/cloud/registries/artifacts.py +++ b/src/gcore/resources/cloud/registries/artifacts.py @@ -72,7 +72,9 @@ def list( if not repository_name: raise ValueError(f"Expected a non-empty value for `repository_name` but received {repository_name!r}") return self._get( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -116,7 +118,9 @@ def delete( raise ValueError(f"Expected a non-empty value for `digest` but received {digest!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts/{digest}", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts/{digest}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts/{digest}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -177,7 +181,9 @@ async def list( if not repository_name: raise ValueError(f"Expected a non-empty value for `repository_name` but received {repository_name!r}") return await self._get( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -221,7 +227,9 @@ async def delete( raise ValueError(f"Expected a non-empty value for `digest` but received {digest!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts/{digest}", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts/{digest}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts/{digest}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/registries/registries.py b/src/gcore/resources/cloud/registries/registries.py index 8889d473..b8623cf3 100644 --- a/src/gcore/resources/cloud/registries/registries.py +++ b/src/gcore/resources/cloud/registries/registries.py @@ -126,7 +126,9 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/registries/{project_id}/{region_id}", + f"/cloud/v1/registries/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}", body=maybe_transform( { "name": name, @@ -169,7 +171,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/registries/{project_id}/{region_id}", + f"/cloud/v1/registries/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -207,7 +211,9 @@ def delete( region_id = self._client._get_cloud_region_id_path_param() extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -244,7 +250,9 @@ def get( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -284,7 +292,9 @@ def resize( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._patch( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/resize", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/resize" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/resize", body=maybe_transform({"storage_limit": storage_limit}, registry_resize_params.RegistryResizeParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -365,7 +375,9 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/registries/{project_id}/{region_id}", + f"/cloud/v1/registries/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}", body=await async_maybe_transform( { "name": name, @@ -408,7 +420,9 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/registries/{project_id}/{region_id}", + f"/cloud/v1/registries/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -446,7 +460,9 @@ async def delete( region_id = self._client._get_cloud_region_id_path_param() extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -483,7 +499,9 @@ async def get( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -523,7 +541,9 @@ async def resize( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._patch( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/resize", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/resize" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/resize", body=await async_maybe_transform( {"storage_limit": storage_limit}, registry_resize_params.RegistryResizeParams ), diff --git a/src/gcore/resources/cloud/registries/repositories.py b/src/gcore/resources/cloud/registries/repositories.py index 74377052..452755d2 100644 --- a/src/gcore/resources/cloud/registries/repositories.py +++ b/src/gcore/resources/cloud/registries/repositories.py @@ -69,7 +69,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -110,7 +112,9 @@ def delete( raise ValueError(f"Expected a non-empty value for `repository_name` but received {repository_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -168,7 +172,9 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -209,7 +215,9 @@ async def delete( raise ValueError(f"Expected a non-empty value for `repository_name` but received {repository_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/registries/tags.py b/src/gcore/resources/cloud/registries/tags.py index ab35828c..7bed1478 100644 --- a/src/gcore/resources/cloud/registries/tags.py +++ b/src/gcore/resources/cloud/registries/tags.py @@ -78,7 +78,9 @@ def delete( raise ValueError(f"Expected a non-empty value for `tag_name` but received {tag_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts/{digest}/tags/{tag_name}", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts/{digest}/tags/{tag_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts/{digest}/tags/{tag_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -146,7 +148,9 @@ async def delete( raise ValueError(f"Expected a non-empty value for `tag_name` but received {tag_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts/{digest}/tags/{tag_name}", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts/{digest}/tags/{tag_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts/{digest}/tags/{tag_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/registries/users.py b/src/gcore/resources/cloud/registries/users.py index f535c7dd..8c402baf 100644 --- a/src/gcore/resources/cloud/registries/users.py +++ b/src/gcore/resources/cloud/registries/users.py @@ -89,7 +89,9 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users", body=maybe_transform( { "duration": duration, @@ -142,7 +144,9 @@ def update( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._patch( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}", body=maybe_transform( { "duration": duration, @@ -186,7 +190,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -225,7 +231,9 @@ def delete( region_id = self._client._get_cloud_region_id_path_param() extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -265,7 +273,9 @@ def create_multiple( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/batch", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/batch" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/batch", body=maybe_transform({"users": users}, user_create_multiple_params.UserCreateMultipleParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -304,7 +314,9 @@ def refresh_secret( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}/refresh_secret", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}/refresh_secret" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}/refresh_secret", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -375,7 +387,9 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users", body=await async_maybe_transform( { "duration": duration, @@ -428,7 +442,9 @@ async def update( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._patch( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}", body=await async_maybe_transform( { "duration": duration, @@ -472,7 +488,9 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -511,7 +529,9 @@ async def delete( region_id = self._client._get_cloud_region_id_path_param() extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -551,7 +571,9 @@ async def create_multiple( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/batch", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/batch" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/batch", body=await async_maybe_transform({"users": users}, user_create_multiple_params.UserCreateMultipleParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -590,7 +612,9 @@ async def refresh_secret( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}/refresh_secret", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}/refresh_secret" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}/refresh_secret", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/reserved_fixed_ips/reserved_fixed_ips.py b/src/gcore/resources/cloud/reserved_fixed_ips/reserved_fixed_ips.py index 5acd6b62..e8714211 100644 --- a/src/gcore/resources/cloud/reserved_fixed_ips/reserved_fixed_ips.py +++ b/src/gcore/resources/cloud/reserved_fixed_ips/reserved_fixed_ips.py @@ -274,7 +274,9 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}", body=maybe_transform( { "type": type, @@ -352,7 +354,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}", page=SyncOffsetPage[ReservedFixedIP], options=make_request_options( extra_headers=extra_headers, @@ -409,7 +413,9 @@ def delete( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return self._delete( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -448,7 +454,9 @@ def get( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return self._get( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -987,7 +995,9 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}", body=await async_maybe_transform( { "type": type, @@ -1065,7 +1075,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}", page=AsyncOffsetPage[ReservedFixedIP], options=make_request_options( extra_headers=extra_headers, @@ -1122,7 +1134,9 @@ async def delete( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return await self._delete( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1161,7 +1175,9 @@ async def get( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return await self._get( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/reserved_fixed_ips/vip.py b/src/gcore/resources/cloud/reserved_fixed_ips/vip.py index 1d6c76e2..22757eba 100644 --- a/src/gcore/resources/cloud/reserved_fixed_ips/vip.py +++ b/src/gcore/resources/cloud/reserved_fixed_ips/vip.py @@ -79,7 +79,9 @@ def list_candidate_ports( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return self._get( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/available_devices", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/available_devices" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/available_devices", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -118,7 +120,9 @@ def list_connected_ports( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return self._get( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -160,7 +164,9 @@ def replace_connected_ports( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return self._put( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices", body=maybe_transform( {"port_ids": port_ids}, vip_replace_connected_ports_params.VipReplaceConnectedPortsParams ), @@ -205,7 +211,9 @@ def toggle( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return self._patch( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}", body=maybe_transform({"is_vip": is_vip}, vip_toggle_params.VipToggleParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -248,7 +256,9 @@ def update_connected_ports( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return self._patch( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices", body=maybe_transform( {"port_ids": port_ids}, vip_update_connected_ports_params.VipUpdateConnectedPortsParams ), @@ -311,7 +321,9 @@ async def list_candidate_ports( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return await self._get( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/available_devices", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/available_devices" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/available_devices", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -350,7 +362,9 @@ async def list_connected_ports( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return await self._get( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -392,7 +406,9 @@ async def replace_connected_ports( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return await self._put( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices", body=await async_maybe_transform( {"port_ids": port_ids}, vip_replace_connected_ports_params.VipReplaceConnectedPortsParams ), @@ -437,7 +453,9 @@ async def toggle( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return await self._patch( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}", body=await async_maybe_transform({"is_vip": is_vip}, vip_toggle_params.VipToggleParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -480,7 +498,9 @@ async def update_connected_ports( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return await self._patch( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices", body=await async_maybe_transform( {"port_ids": port_ids}, vip_update_connected_ports_params.VipUpdateConnectedPortsParams ), diff --git a/src/gcore/resources/cloud/secrets.py b/src/gcore/resources/cloud/secrets.py index b1c6a224..962ea5eb 100644 --- a/src/gcore/resources/cloud/secrets.py +++ b/src/gcore/resources/cloud/secrets.py @@ -86,7 +86,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/secrets/{project_id}/{region_id}", + f"/cloud/v1/secrets/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/secrets/{project_id}/{region_id}", page=SyncOffsetPage[Secret], options=make_request_options( extra_headers=extra_headers, @@ -142,7 +144,9 @@ def delete( if not secret_id: raise ValueError(f"Expected a non-empty value for `secret_id` but received {secret_id!r}") return self._delete( - f"/cloud/v1/secrets/{project_id}/{region_id}/{secret_id}", + f"/cloud/v1/secrets/{project_id}/{region_id}/{secret_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/secrets/{project_id}/{region_id}/{secret_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -187,7 +191,9 @@ def get( if not secret_id: raise ValueError(f"Expected a non-empty value for `secret_id` but received {secret_id!r}") return self._get( - f"/cloud/v1/secrets/{project_id}/{region_id}/{secret_id}", + f"/cloud/v1/secrets/{project_id}/{region_id}/{secret_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/secrets/{project_id}/{region_id}/{secret_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -236,7 +242,9 @@ def upload_tls_certificate( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v2/secrets/{project_id}/{region_id}", + f"/cloud/v2/secrets/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/secrets/{project_id}/{region_id}", body=maybe_transform( { "name": name, @@ -353,7 +361,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/secrets/{project_id}/{region_id}", + f"/cloud/v1/secrets/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/secrets/{project_id}/{region_id}", page=AsyncOffsetPage[Secret], options=make_request_options( extra_headers=extra_headers, @@ -409,7 +419,9 @@ async def delete( if not secret_id: raise ValueError(f"Expected a non-empty value for `secret_id` but received {secret_id!r}") return await self._delete( - f"/cloud/v1/secrets/{project_id}/{region_id}/{secret_id}", + f"/cloud/v1/secrets/{project_id}/{region_id}/{secret_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/secrets/{project_id}/{region_id}/{secret_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -454,7 +466,9 @@ async def get( if not secret_id: raise ValueError(f"Expected a non-empty value for `secret_id` but received {secret_id!r}") return await self._get( - f"/cloud/v1/secrets/{project_id}/{region_id}/{secret_id}", + f"/cloud/v1/secrets/{project_id}/{region_id}/{secret_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/secrets/{project_id}/{region_id}/{secret_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -503,7 +517,9 @@ async def upload_tls_certificate( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v2/secrets/{project_id}/{region_id}", + f"/cloud/v2/secrets/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v2/secrets/{project_id}/{region_id}", body=await async_maybe_transform( { "name": name, diff --git a/src/gcore/resources/cloud/security_groups/rules.py b/src/gcore/resources/cloud/security_groups/rules.py index 89b27a23..c69d2608 100644 --- a/src/gcore/resources/cloud/security_groups/rules.py +++ b/src/gcore/resources/cloud/security_groups/rules.py @@ -126,7 +126,9 @@ def create( if not group_id: raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") return self._post( - f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/rules", + f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/rules" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/rules", body=maybe_transform( { "description": description, @@ -179,7 +181,9 @@ def delete( raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v1/securitygrouprules/{project_id}/{region_id}/{rule_id}", + f"/cloud/v1/securitygrouprules/{project_id}/{region_id}/{rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/securitygrouprules/{project_id}/{region_id}/{rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -273,7 +277,9 @@ def replace( if not rule_id: raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}") return self._put( - f"/cloud/v1/securitygrouprules/{project_id}/{region_id}/{rule_id}", + f"/cloud/v1/securitygrouprules/{project_id}/{region_id}/{rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/securitygrouprules/{project_id}/{region_id}/{rule_id}", body=maybe_transform( { "direction": direction, @@ -397,7 +403,9 @@ async def create( if not group_id: raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") return await self._post( - f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/rules", + f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/rules" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/rules", body=await async_maybe_transform( { "description": description, @@ -450,7 +458,9 @@ async def delete( raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v1/securitygrouprules/{project_id}/{region_id}/{rule_id}", + f"/cloud/v1/securitygrouprules/{project_id}/{region_id}/{rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/securitygrouprules/{project_id}/{region_id}/{rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -544,7 +554,9 @@ async def replace( if not rule_id: raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}") return await self._put( - f"/cloud/v1/securitygrouprules/{project_id}/{region_id}/{rule_id}", + f"/cloud/v1/securitygrouprules/{project_id}/{region_id}/{rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/securitygrouprules/{project_id}/{region_id}/{rule_id}", body=await async_maybe_transform( { "direction": direction, diff --git a/src/gcore/resources/cloud/security_groups/security_groups.py b/src/gcore/resources/cloud/security_groups/security_groups.py index ac4d9bc3..0e24383b 100644 --- a/src/gcore/resources/cloud/security_groups/security_groups.py +++ b/src/gcore/resources/cloud/security_groups/security_groups.py @@ -97,7 +97,9 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/securitygroups/{project_id}/{region_id}", + f"/cloud/v1/securitygroups/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}", body=maybe_transform( { "security_group": security_group, @@ -170,7 +172,9 @@ def update( if not group_id: raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") return self._patch( - f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}", + f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}", body=maybe_transform( { "changed_rules": changed_rules, @@ -226,7 +230,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/securitygroups/{project_id}/{region_id}", + f"/cloud/v1/securitygroups/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}", page=SyncOffsetPage[SecurityGroup], options=make_request_options( extra_headers=extra_headers, @@ -279,7 +285,9 @@ def delete( raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}", + f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -321,7 +329,9 @@ def copy( if not group_id: raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") return self._post( - f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/copy", + f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/copy" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/copy", body=maybe_transform({"name": name}, security_group_copy_params.SecurityGroupCopyParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -361,7 +371,9 @@ def get( if not group_id: raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") return self._get( - f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}", + f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -400,7 +412,9 @@ def revert_to_default( if not group_id: raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") return self._post( - f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/revert", + f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/revert" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/revert", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -467,7 +481,9 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/securitygroups/{project_id}/{region_id}", + f"/cloud/v1/securitygroups/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}", body=await async_maybe_transform( { "security_group": security_group, @@ -540,7 +556,9 @@ async def update( if not group_id: raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") return await self._patch( - f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}", + f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}", body=await async_maybe_transform( { "changed_rules": changed_rules, @@ -596,7 +614,9 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/securitygroups/{project_id}/{region_id}", + f"/cloud/v1/securitygroups/{project_id}/{region_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}", page=AsyncOffsetPage[SecurityGroup], options=make_request_options( extra_headers=extra_headers, @@ -649,7 +669,9 @@ async def delete( raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}", + f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -691,7 +713,9 @@ async def copy( if not group_id: raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") return await self._post( - f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/copy", + f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/copy" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/copy", body=await async_maybe_transform({"name": name}, security_group_copy_params.SecurityGroupCopyParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -731,7 +755,9 @@ async def get( if not group_id: raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") return await self._get( - f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}", + f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -770,7 +796,9 @@ async def revert_to_default( if not group_id: raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") return await self._post( - f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/revert", + f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/revert" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/revert", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/ssh_keys.py b/src/gcore/resources/cloud/ssh_keys.py index 788d415c..30ef2830 100644 --- a/src/gcore/resources/cloud/ssh_keys.py +++ b/src/gcore/resources/cloud/ssh_keys.py @@ -90,7 +90,9 @@ def create( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._post( - f"/cloud/v1/ssh_keys/{project_id}", + f"/cloud/v1/ssh_keys/{project_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ssh_keys/{project_id}", body=maybe_transform( { "name": name, @@ -141,7 +143,9 @@ def update( if not ssh_key_id: raise ValueError(f"Expected a non-empty value for `ssh_key_id` but received {ssh_key_id!r}") return self._patch( - f"/cloud/v1/ssh_keys/{project_id}/{ssh_key_id}", + f"/cloud/v1/ssh_keys/{project_id}/{ssh_key_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ssh_keys/{project_id}/{ssh_key_id}", body=maybe_transform({"shared_in_project": shared_in_project}, ssh_key_update_params.SSHKeyUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -186,7 +190,9 @@ def list( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._get_api_list( - f"/cloud/v1/ssh_keys/{project_id}", + f"/cloud/v1/ssh_keys/{project_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ssh_keys/{project_id}", page=SyncOffsetPage[SSHKey], options=make_request_options( extra_headers=extra_headers, @@ -239,7 +245,9 @@ def delete( raise ValueError(f"Expected a non-empty value for `ssh_key_id` but received {ssh_key_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v1/ssh_keys/{project_id}/{ssh_key_id}", + f"/cloud/v1/ssh_keys/{project_id}/{ssh_key_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ssh_keys/{project_id}/{ssh_key_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -279,7 +287,9 @@ def get( if not ssh_key_id: raise ValueError(f"Expected a non-empty value for `ssh_key_id` but received {ssh_key_id!r}") return self._get( - f"/cloud/v1/ssh_keys/{project_id}/{ssh_key_id}", + f"/cloud/v1/ssh_keys/{project_id}/{ssh_key_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ssh_keys/{project_id}/{ssh_key_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -352,7 +362,9 @@ async def create( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return await self._post( - f"/cloud/v1/ssh_keys/{project_id}", + f"/cloud/v1/ssh_keys/{project_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ssh_keys/{project_id}", body=await async_maybe_transform( { "name": name, @@ -403,7 +415,9 @@ async def update( if not ssh_key_id: raise ValueError(f"Expected a non-empty value for `ssh_key_id` but received {ssh_key_id!r}") return await self._patch( - f"/cloud/v1/ssh_keys/{project_id}/{ssh_key_id}", + f"/cloud/v1/ssh_keys/{project_id}/{ssh_key_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ssh_keys/{project_id}/{ssh_key_id}", body=await async_maybe_transform( {"shared_in_project": shared_in_project}, ssh_key_update_params.SSHKeyUpdateParams ), @@ -450,7 +464,9 @@ def list( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._get_api_list( - f"/cloud/v1/ssh_keys/{project_id}", + f"/cloud/v1/ssh_keys/{project_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ssh_keys/{project_id}", page=AsyncOffsetPage[SSHKey], options=make_request_options( extra_headers=extra_headers, @@ -503,7 +519,9 @@ async def delete( raise ValueError(f"Expected a non-empty value for `ssh_key_id` but received {ssh_key_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v1/ssh_keys/{project_id}/{ssh_key_id}", + f"/cloud/v1/ssh_keys/{project_id}/{ssh_key_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ssh_keys/{project_id}/{ssh_key_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -543,7 +561,9 @@ async def get( if not ssh_key_id: raise ValueError(f"Expected a non-empty value for `ssh_key_id` but received {ssh_key_id!r}") return await self._get( - f"/cloud/v1/ssh_keys/{project_id}/{ssh_key_id}", + f"/cloud/v1/ssh_keys/{project_id}/{ssh_key_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/ssh_keys/{project_id}/{ssh_key_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/tasks.py b/src/gcore/resources/cloud/tasks.py index 2fbc8d91..b52d711c 100644 --- a/src/gcore/resources/cloud/tasks.py +++ b/src/gcore/resources/cloud/tasks.py @@ -194,7 +194,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v1/tasks", + "/cloud/v1/tasks" if self._client._base_url_overridden else "https://api.gcore.com//cloud/v1/tasks", page=SyncOffsetPage[Task], options=make_request_options( extra_headers=extra_headers, @@ -251,7 +251,9 @@ def acknowledge_all( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - "/cloud/v1/tasks/acknowledge_all", + "/cloud/v1/tasks/acknowledge_all" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v1/tasks/acknowledge_all", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -296,7 +298,9 @@ def acknowledge_one( if not task_id: raise ValueError(f"Expected a non-empty value for `task_id` but received {task_id!r}") return self._post( - f"/cloud/v1/tasks/{task_id}/acknowledge", + f"/cloud/v1/tasks/{task_id}/acknowledge" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/tasks/{task_id}/acknowledge", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -331,7 +335,9 @@ def get( if not task_id: raise ValueError(f"Expected a non-empty value for `task_id` but received {task_id!r}") return self._get( - f"/cloud/v1/tasks/{task_id}", + f"/cloud/v1/tasks/{task_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/tasks/{task_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -503,7 +509,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v1/tasks", + "/cloud/v1/tasks" if self._client._base_url_overridden else "https://api.gcore.com//cloud/v1/tasks", page=AsyncOffsetPage[Task], options=make_request_options( extra_headers=extra_headers, @@ -560,7 +566,9 @@ async def acknowledge_all( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - "/cloud/v1/tasks/acknowledge_all", + "/cloud/v1/tasks/acknowledge_all" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v1/tasks/acknowledge_all", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -605,7 +613,9 @@ async def acknowledge_one( if not task_id: raise ValueError(f"Expected a non-empty value for `task_id` but received {task_id!r}") return await self._post( - f"/cloud/v1/tasks/{task_id}/acknowledge", + f"/cloud/v1/tasks/{task_id}/acknowledge" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/tasks/{task_id}/acknowledge", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -640,7 +650,9 @@ async def get( if not task_id: raise ValueError(f"Expected a non-empty value for `task_id` but received {task_id!r}") return await self._get( - f"/cloud/v1/tasks/{task_id}", + f"/cloud/v1/tasks/{task_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/tasks/{task_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/usage_reports.py b/src/gcore/resources/cloud/usage_reports.py index 0adc0809..48387eda 100644 --- a/src/gcore/resources/cloud/usage_reports.py +++ b/src/gcore/resources/cloud/usage_reports.py @@ -139,7 +139,9 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/cloud/v1/usage_report", + "/cloud/v1/usage_report" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v1/usage_report", body=maybe_transform( { "time_from": time_from, @@ -277,7 +279,9 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/cloud/v1/usage_report", + "/cloud/v1/usage_report" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v1/usage_report", body=await async_maybe_transform( { "time_from": time_from, diff --git a/src/gcore/resources/cloud/users/role_assignments.py b/src/gcore/resources/cloud/users/role_assignments.py index 5294d3a7..0318b8fc 100644 --- a/src/gcore/resources/cloud/users/role_assignments.py +++ b/src/gcore/resources/cloud/users/role_assignments.py @@ -85,7 +85,9 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/cloud/v1/users/assignments", + "/cloud/v1/users/assignments" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v1/users/assignments", body=maybe_transform( { "role": role, @@ -139,7 +141,9 @@ def update( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/cloud/v1/users/assignments/{assignment_id}", + f"/cloud/v1/users/assignments/{assignment_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/users/assignments/{assignment_id}", body=maybe_transform( { "role": role, @@ -191,7 +195,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v1/users/assignments", + "/cloud/v1/users/assignments" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v1/users/assignments", page=SyncOffsetPage[RoleAssignment], options=make_request_options( extra_headers=extra_headers, @@ -237,7 +243,9 @@ def delete( timeout: Override the client-level default timeout for this request, in seconds """ return self._delete( - f"/cloud/v1/users/assignments/{assignment_id}", + f"/cloud/v1/users/assignments/{assignment_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/users/assignments/{assignment_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -300,7 +308,9 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/cloud/v1/users/assignments", + "/cloud/v1/users/assignments" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v1/users/assignments", body=await async_maybe_transform( { "role": role, @@ -354,7 +364,9 @@ async def update( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/cloud/v1/users/assignments/{assignment_id}", + f"/cloud/v1/users/assignments/{assignment_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/users/assignments/{assignment_id}", body=await async_maybe_transform( { "role": role, @@ -406,7 +418,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v1/users/assignments", + "/cloud/v1/users/assignments" + if self._client._base_url_overridden + else "https://api.gcore.com//cloud/v1/users/assignments", page=AsyncOffsetPage[RoleAssignment], options=make_request_options( extra_headers=extra_headers, @@ -452,7 +466,9 @@ async def delete( timeout: Override the client-level default timeout for this request, in seconds """ return await self._delete( - f"/cloud/v1/users/assignments/{assignment_id}", + f"/cloud/v1/users/assignments/{assignment_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//cloud/v1/users/assignments/{assignment_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/volumes.py b/src/gcore/resources/cloud/volumes.py index 60784300..3758fe11 100644 --- a/src/gcore/resources/cloud/volumes.py +++ b/src/gcore/resources/cloud/volumes.py @@ -292,7 +292,9 @@ def create( 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}", + 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}", body=maybe_transform( { "image_id": image_id, @@ -376,7 +378,9 @@ def update( 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}", + 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}", body=maybe_transform( { "name": name, @@ -458,7 +462,9 @@ def list( 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}", + 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}", page=SyncOffsetPage[Volume], options=make_request_options( extra_headers=extra_headers, @@ -527,7 +533,9 @@ def delete( 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}", + 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}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -584,7 +592,9 @@ def attach_to_instance( 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", + 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", body=maybe_transform( { "instance_id": instance_id, @@ -641,7 +651,9 @@ def change_type( 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", + 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", 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 @@ -690,7 +702,9 @@ def detach_from_instance( 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", + 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", body=maybe_transform( {"instance_id": instance_id}, volume_detach_from_instance_params.VolumeDetachFromInstanceParams ), @@ -738,7 +752,9 @@ def get( 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}", + 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}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -788,7 +804,9 @@ def resize( 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", + 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", 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 @@ -837,7 +855,9 @@ def revert_to_last_snapshot( 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", + 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", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1522,7 +1542,9 @@ async def create( 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}", + 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}", body=await async_maybe_transform( { "image_id": image_id, @@ -1606,7 +1628,9 @@ async def update( 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}", + 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}", body=await async_maybe_transform( { "name": name, @@ -1688,7 +1712,9 @@ def list( 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}", + 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}", page=AsyncOffsetPage[Volume], options=make_request_options( extra_headers=extra_headers, @@ -1757,7 +1783,9 @@ async def delete( 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}", + 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}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1814,7 +1842,9 @@ async def attach_to_instance( 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", + 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", body=await async_maybe_transform( { "instance_id": instance_id, @@ -1871,7 +1901,9 @@ async def change_type( 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", + 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", body=await async_maybe_transform( {"volume_type": volume_type}, volume_change_type_params.VolumeChangeTypeParams ), @@ -1922,7 +1954,9 @@ async def detach_from_instance( 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", + 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", body=await async_maybe_transform( {"instance_id": instance_id}, volume_detach_from_instance_params.VolumeDetachFromInstanceParams ), @@ -1970,7 +2004,9 @@ async def get( 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}", + 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}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -2020,7 +2056,9 @@ async def resize( 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", + 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", 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 @@ -2069,7 +2107,9 @@ async def revert_to_last_snapshot( 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", + 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", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/dns/dns.py b/src/gcore/resources/dns/dns.py index 3e6485d0..612cd629 100644 --- a/src/gcore/resources/dns/dns.py +++ b/src/gcore/resources/dns/dns.py @@ -104,7 +104,9 @@ def get_account_overview( ) -> DNSGetAccountOverviewResponse: """Get info about client""" return self._get( - "/dns/v2/platform/info", + "/dns/v2/platform/info" + if self._client._base_url_overridden + else "https://api.gcore.com//dns/v2/platform/info", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -141,7 +143,7 @@ def lookup( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/dns/v2/lookup", + "/dns/v2/lookup" if self._client._base_url_overridden else "https://api.gcore.com//dns/v2/lookup", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -207,7 +209,9 @@ async def get_account_overview( ) -> DNSGetAccountOverviewResponse: """Get info about client""" return await self._get( - "/dns/v2/platform/info", + "/dns/v2/platform/info" + if self._client._base_url_overridden + else "https://api.gcore.com//dns/v2/platform/info", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -244,7 +248,7 @@ async def lookup( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/dns/v2/lookup", + "/dns/v2/lookup" if self._client._base_url_overridden else "https://api.gcore.com//dns/v2/lookup", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/dns/locations.py b/src/gcore/resources/dns/locations.py index 20dcea5a..c58907a8 100644 --- a/src/gcore/resources/dns/locations.py +++ b/src/gcore/resources/dns/locations.py @@ -54,7 +54,7 @@ def list( ) -> LocationListResponse: """List of All locations continents/countries/regions.""" return self._get( - "/dns/v2/locations", + "/dns/v2/locations" if self._client._base_url_overridden else "https://api.gcore.com//dns/v2/locations", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -73,7 +73,9 @@ def list_continents( ) -> LocationListContinentsResponse: """List of All locations continents.""" return self._get( - "/dns/v2/locations/continents", + "/dns/v2/locations/continents" + if self._client._base_url_overridden + else "https://api.gcore.com//dns/v2/locations/continents", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -92,7 +94,9 @@ def list_countries( ) -> LocationListCountriesResponse: """List of All locations countries.""" return self._get( - "/dns/v2/locations/countries", + "/dns/v2/locations/countries" + if self._client._base_url_overridden + else "https://api.gcore.com//dns/v2/locations/countries", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -111,7 +115,9 @@ def list_regions( ) -> LocationListRegionsResponse: """List of All locations regions.""" return self._get( - "/dns/v2/locations/regions", + "/dns/v2/locations/regions" + if self._client._base_url_overridden + else "https://api.gcore.com//dns/v2/locations/regions", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -151,7 +157,7 @@ async def list( ) -> LocationListResponse: """List of All locations continents/countries/regions.""" return await self._get( - "/dns/v2/locations", + "/dns/v2/locations" if self._client._base_url_overridden else "https://api.gcore.com//dns/v2/locations", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -170,7 +176,9 @@ async def list_continents( ) -> LocationListContinentsResponse: """List of All locations continents.""" return await self._get( - "/dns/v2/locations/continents", + "/dns/v2/locations/continents" + if self._client._base_url_overridden + else "https://api.gcore.com//dns/v2/locations/continents", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -189,7 +197,9 @@ async def list_countries( ) -> LocationListCountriesResponse: """List of All locations countries.""" return await self._get( - "/dns/v2/locations/countries", + "/dns/v2/locations/countries" + if self._client._base_url_overridden + else "https://api.gcore.com//dns/v2/locations/countries", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -208,7 +218,9 @@ async def list_regions( ) -> LocationListRegionsResponse: """List of All locations regions.""" return await self._get( - "/dns/v2/locations/regions", + "/dns/v2/locations/regions" + if self._client._base_url_overridden + else "https://api.gcore.com//dns/v2/locations/regions", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/dns/metrics.py b/src/gcore/resources/dns/metrics.py index 8eef7aeb..b9bf45a5 100644 --- a/src/gcore/resources/dns/metrics.py +++ b/src/gcore/resources/dns/metrics.py @@ -82,7 +82,9 @@ def list( """ extra_headers = {"Accept": "plain/text", **(extra_headers or {})} return self._get( - "/dns/v2/monitor/metrics", + "/dns/v2/monitor/metrics" + if self._client._base_url_overridden + else "https://api.gcore.com//dns/v2/monitor/metrics", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -160,7 +162,9 @@ async def list( """ extra_headers = {"Accept": "plain/text", **(extra_headers or {})} return await self._get( - "/dns/v2/monitor/metrics", + "/dns/v2/monitor/metrics" + if self._client._base_url_overridden + else "https://api.gcore.com//dns/v2/monitor/metrics", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/dns/pickers/pickers.py b/src/gcore/resources/dns/pickers/pickers.py index 3078c7f2..599a2450 100644 --- a/src/gcore/resources/dns/pickers/pickers.py +++ b/src/gcore/resources/dns/pickers/pickers.py @@ -63,7 +63,7 @@ def list( ) -> PickerListResponse: """Returns list of picker""" return self._get( - "/dns/v2/pickers", + "/dns/v2/pickers" if self._client._base_url_overridden else "https://api.gcore.com//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 @@ async def list( ) -> PickerListResponse: """Returns list of picker""" return await self._get( - "/dns/v2/pickers", + "/dns/v2/pickers" if self._client._base_url_overridden else "https://api.gcore.com//dns/v2/pickers", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/dns/pickers/presets.py b/src/gcore/resources/dns/pickers/presets.py index aebd10ff..09f7d53b 100644 --- a/src/gcore/resources/dns/pickers/presets.py +++ b/src/gcore/resources/dns/pickers/presets.py @@ -51,7 +51,9 @@ def list( ) -> PresetListResponse: """Returns list of picker preset""" return self._get( - "/dns/v2/pickers/presets", + "/dns/v2/pickers/presets" + if self._client._base_url_overridden + else "https://api.gcore.com//dns/v2/pickers/presets", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -91,7 +93,9 @@ async def list( ) -> PresetListResponse: """Returns list of picker preset""" return await self._get( - "/dns/v2/pickers/presets", + "/dns/v2/pickers/presets" + if self._client._base_url_overridden + else "https://api.gcore.com//dns/v2/pickers/presets", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/dns/zones/dnssec.py b/src/gcore/resources/dns/zones/dnssec.py index 8c747071..8f283155 100644 --- a/src/gcore/resources/dns/zones/dnssec.py +++ b/src/gcore/resources/dns/zones/dnssec.py @@ -69,7 +69,9 @@ def update( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return self._patch( - f"/dns/v2/zones/{name}/dnssec", + f"/dns/v2/zones/{name}/dnssec" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{name}/dnssec", body=maybe_transform({"enabled": enabled}, dnssec_update_params.DnssecUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -103,7 +105,9 @@ def get( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return self._get( - f"/dns/v2/zones/{name}/dnssec", + f"/dns/v2/zones/{name}/dnssec" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{name}/dnssec", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -158,7 +162,9 @@ async def update( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return await self._patch( - f"/dns/v2/zones/{name}/dnssec", + f"/dns/v2/zones/{name}/dnssec" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{name}/dnssec", body=await async_maybe_transform({"enabled": enabled}, dnssec_update_params.DnssecUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -192,7 +198,9 @@ async def get( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return await self._get( - f"/dns/v2/zones/{name}/dnssec", + f"/dns/v2/zones/{name}/dnssec" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{name}/dnssec", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/dns/zones/rrsets.py b/src/gcore/resources/dns/zones/rrsets.py index e1d136b1..93697456 100644 --- a/src/gcore/resources/dns/zones/rrsets.py +++ b/src/gcore/resources/dns/zones/rrsets.py @@ -205,7 +205,9 @@ def create( if not rrset_type: raise ValueError(f"Expected a non-empty value for `rrset_type` but received {rrset_type!r}") return self._post( - f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", + f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", body=maybe_transform( { "resource_records": resource_records, @@ -259,7 +261,9 @@ def list( if not zone_name: raise ValueError(f"Expected a non-empty value for `zone_name` but received {zone_name!r}") return self._get( - f"/dns/v2/zones/{zone_name}/rrsets", + f"/dns/v2/zones/{zone_name}/rrsets" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{zone_name}/rrsets", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -310,7 +314,9 @@ def delete( if not rrset_type: raise ValueError(f"Expected a non-empty value for `rrset_type` but received {rrset_type!r}") return self._delete( - f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", + f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -349,7 +355,9 @@ def get( if not rrset_type: raise ValueError(f"Expected a non-empty value for `rrset_type` but received {rrset_type!r}") return self._get( - f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", + f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -394,7 +402,9 @@ def get_failover_logs( if not rrset_type: raise ValueError(f"Expected a non-empty value for `rrset_type` but received {rrset_type!r}") return self._get( - f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}/failover/log", + f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}/failover/log" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}/failover/log", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -453,7 +463,9 @@ def replace( if not rrset_type: raise ValueError(f"Expected a non-empty value for `rrset_type` but received {rrset_type!r}") return self._put( - f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", + f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", body=maybe_transform( { "resource_records": resource_records, @@ -644,7 +656,9 @@ async def create( if not rrset_type: raise ValueError(f"Expected a non-empty value for `rrset_type` but received {rrset_type!r}") return await self._post( - f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", + f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", body=await async_maybe_transform( { "resource_records": resource_records, @@ -698,7 +712,9 @@ async def list( if not zone_name: raise ValueError(f"Expected a non-empty value for `zone_name` but received {zone_name!r}") return await self._get( - f"/dns/v2/zones/{zone_name}/rrsets", + f"/dns/v2/zones/{zone_name}/rrsets" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{zone_name}/rrsets", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -749,7 +765,9 @@ async def delete( if not rrset_type: raise ValueError(f"Expected a non-empty value for `rrset_type` but received {rrset_type!r}") return await self._delete( - f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", + f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -788,7 +806,9 @@ async def get( if not rrset_type: raise ValueError(f"Expected a non-empty value for `rrset_type` but received {rrset_type!r}") return await self._get( - f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", + f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -833,7 +853,9 @@ async def get_failover_logs( if not rrset_type: raise ValueError(f"Expected a non-empty value for `rrset_type` but received {rrset_type!r}") return await self._get( - f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}/failover/log", + f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}/failover/log" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}/failover/log", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -892,7 +914,9 @@ async def replace( if not rrset_type: raise ValueError(f"Expected a non-empty value for `rrset_type` but received {rrset_type!r}") return await self._put( - f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", + f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", body=await async_maybe_transform( { "resource_records": resource_records, diff --git a/src/gcore/resources/dns/zones/zones.py b/src/gcore/resources/dns/zones/zones.py index 75e11dde..31b815a3 100644 --- a/src/gcore/resources/dns/zones/zones.py +++ b/src/gcore/resources/dns/zones/zones.py @@ -143,7 +143,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/dns/v2/zones", + "/dns/v2/zones" if self._client._base_url_overridden else "https://api.gcore.com//dns/v2/zones", body=maybe_transform( { "name": name, @@ -225,7 +225,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/dns/v2/zones", + "/dns/v2/zones" if self._client._base_url_overridden else "https://api.gcore.com//dns/v2/zones", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -283,7 +283,9 @@ def delete( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return self._delete( - f"/dns/v2/zones/{name}", + f"/dns/v2/zones/{name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -318,7 +320,9 @@ def check_delegation_status( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return self._post( - f"/dns/v2/analyze/{name}/delegation-status", + f"/dns/v2/analyze/{name}/delegation-status" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/analyze/{name}/delegation-status", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -351,7 +355,9 @@ def disable( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return self._patch( - f"/dns/v2/zones/{name}/disable", + f"/dns/v2/zones/{name}/disable" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{name}/disable", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -384,7 +390,9 @@ def enable( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return self._patch( - f"/dns/v2/zones/{name}/enable", + f"/dns/v2/zones/{name}/enable" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{name}/enable", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -417,7 +425,9 @@ def export( if not zone_name: raise ValueError(f"Expected a non-empty value for `zone_name` but received {zone_name!r}") return self._get( - f"/dns/v2/zones/{zone_name}/export", + f"/dns/v2/zones/{zone_name}/export" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{zone_name}/export", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -450,7 +460,9 @@ def get( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return self._get( - f"/dns/v2/zones/{name}", + f"/dns/v2/zones/{name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -517,7 +529,9 @@ def get_statistics( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return self._get( - f"/dns/v2/zones/{name}/statistics", + f"/dns/v2/zones/{name}/statistics" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{name}/statistics", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -583,7 +597,9 @@ def import_( if not zone_name: raise ValueError(f"Expected a non-empty value for `zone_name` but received {zone_name!r}") return self._post( - f"/dns/v2/zones/{zone_name}/import", + f"/dns/v2/zones/{zone_name}/import" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{zone_name}/import", body=maybe_transform(body, zone_import_params.ZoneImportParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -656,7 +672,9 @@ def replace( if not path_name: raise ValueError(f"Expected a non-empty value for `path_name` but received {path_name!r}") return self._put( - f"/dns/v2/zones/{path_name}", + f"/dns/v2/zones/{path_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{path_name}", body=maybe_transform( { "body_name": body_name, @@ -769,7 +787,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/dns/v2/zones", + "/dns/v2/zones" if self._client._base_url_overridden else "https://api.gcore.com//dns/v2/zones", body=await async_maybe_transform( { "name": name, @@ -851,7 +869,7 @@ async def list( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/dns/v2/zones", + "/dns/v2/zones" if self._client._base_url_overridden else "https://api.gcore.com//dns/v2/zones", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -909,7 +927,9 @@ async def delete( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return await self._delete( - f"/dns/v2/zones/{name}", + f"/dns/v2/zones/{name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -944,7 +964,9 @@ async def check_delegation_status( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return await self._post( - f"/dns/v2/analyze/{name}/delegation-status", + f"/dns/v2/analyze/{name}/delegation-status" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/analyze/{name}/delegation-status", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -977,7 +999,9 @@ async def disable( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return await self._patch( - f"/dns/v2/zones/{name}/disable", + f"/dns/v2/zones/{name}/disable" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{name}/disable", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1010,7 +1034,9 @@ async def enable( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return await self._patch( - f"/dns/v2/zones/{name}/enable", + f"/dns/v2/zones/{name}/enable" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{name}/enable", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1043,7 +1069,9 @@ async def export( if not zone_name: raise ValueError(f"Expected a non-empty value for `zone_name` but received {zone_name!r}") return await self._get( - f"/dns/v2/zones/{zone_name}/export", + f"/dns/v2/zones/{zone_name}/export" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{zone_name}/export", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1076,7 +1104,9 @@ async def get( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return await self._get( - f"/dns/v2/zones/{name}", + f"/dns/v2/zones/{name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1143,7 +1173,9 @@ async def get_statistics( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return await self._get( - f"/dns/v2/zones/{name}/statistics", + f"/dns/v2/zones/{name}/statistics" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{name}/statistics", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1209,7 +1241,9 @@ async def import_( if not zone_name: raise ValueError(f"Expected a non-empty value for `zone_name` but received {zone_name!r}") return await self._post( - f"/dns/v2/zones/{zone_name}/import", + f"/dns/v2/zones/{zone_name}/import" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{zone_name}/import", body=await async_maybe_transform(body, zone_import_params.ZoneImportParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -1282,7 +1316,9 @@ async def replace( if not path_name: raise ValueError(f"Expected a non-empty value for `path_name` but received {path_name!r}") return await self._put( - f"/dns/v2/zones/{path_name}", + f"/dns/v2/zones/{path_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//dns/v2/zones/{path_name}", body=await async_maybe_transform( { "body_name": body_name, diff --git a/src/gcore/resources/fastedge/apps/apps.py b/src/gcore/resources/fastedge/apps/apps.py index 92d2662a..a72cd50f 100644 --- a/src/gcore/resources/fastedge/apps/apps.py +++ b/src/gcore/resources/fastedge/apps/apps.py @@ -121,7 +121,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/fastedge/v1/apps", + "/fastedge/v1/apps" if self._client._base_url_overridden else "https://api.gcore.com//fastedge/v1/apps", body=maybe_transform( { "binary": binary, @@ -208,7 +208,9 @@ def update( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/fastedge/v1/apps/{id}", + f"/fastedge/v1/apps/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/apps/{id}", body=maybe_transform( { "binary": binary, @@ -305,7 +307,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/fastedge/v1/apps", + "/fastedge/v1/apps" if self._client._base_url_overridden else "https://api.gcore.com//fastedge/v1/apps", page=SyncOffsetPageFastedgeApps[AppShort], options=make_request_options( extra_headers=extra_headers, @@ -355,7 +357,9 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/fastedge/v1/apps/{id}", + f"/fastedge/v1/apps/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/apps/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -386,7 +390,9 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/fastedge/v1/apps/{id}", + f"/fastedge/v1/apps/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/apps/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -418,7 +424,9 @@ def replace( timeout: Override the client-level default timeout for this request, in seconds """ return self._put( - f"/fastedge/v1/apps/{id}", + f"/fastedge/v1/apps/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/apps/{id}", body=maybe_transform(body, app_replace_params.AppReplaceParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -514,7 +522,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/fastedge/v1/apps", + "/fastedge/v1/apps" if self._client._base_url_overridden else "https://api.gcore.com//fastedge/v1/apps", body=await async_maybe_transform( { "binary": binary, @@ -601,7 +609,9 @@ async def update( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/fastedge/v1/apps/{id}", + f"/fastedge/v1/apps/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/apps/{id}", body=await async_maybe_transform( { "binary": binary, @@ -698,7 +708,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/fastedge/v1/apps", + "/fastedge/v1/apps" if self._client._base_url_overridden else "https://api.gcore.com//fastedge/v1/apps", page=AsyncOffsetPageFastedgeApps[AppShort], options=make_request_options( extra_headers=extra_headers, @@ -748,7 +758,9 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/fastedge/v1/apps/{id}", + f"/fastedge/v1/apps/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/apps/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -779,7 +791,9 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/fastedge/v1/apps/{id}", + f"/fastedge/v1/apps/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/apps/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -811,7 +825,9 @@ async def replace( timeout: Override the client-level default timeout for this request, in seconds """ return await self._put( - f"/fastedge/v1/apps/{id}", + f"/fastedge/v1/apps/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/apps/{id}", body=await async_maybe_transform(body, app_replace_params.AppReplaceParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout diff --git a/src/gcore/resources/fastedge/apps/logs.py b/src/gcore/resources/fastedge/apps/logs.py index f43d121c..b61bcfd9 100644 --- a/src/gcore/resources/fastedge/apps/logs.py +++ b/src/gcore/resources/fastedge/apps/logs.py @@ -94,7 +94,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/fastedge/v1/apps/{id}/logs", + f"/fastedge/v1/apps/{id}/logs" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/apps/{id}/logs", page=SyncOffsetPageFastedgeAppLogs[Log], options=make_request_options( extra_headers=extra_headers, @@ -187,7 +189,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/fastedge/v1/apps/{id}/logs", + f"/fastedge/v1/apps/{id}/logs" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/apps/{id}/logs", page=AsyncOffsetPageFastedgeAppLogs[Log], options=make_request_options( extra_headers=extra_headers, diff --git a/src/gcore/resources/fastedge/binaries.py b/src/gcore/resources/fastedge/binaries.py index 8323efb1..bdda5fd9 100644 --- a/src/gcore/resources/fastedge/binaries.py +++ b/src/gcore/resources/fastedge/binaries.py @@ -67,7 +67,9 @@ def create( """ extra_headers = {"Content-Type": "application/octet-stream", **(extra_headers or {})} return self._post( - "/fastedge/v1/binaries/raw", + "/fastedge/v1/binaries/raw" + if self._client._base_url_overridden + else "https://api.gcore.com//fastedge/v1/binaries/raw", body=read_file_content(body), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -87,7 +89,9 @@ def list( ) -> BinaryListResponse: """List binaries""" return self._get( - "/fastedge/v1/binaries", + "/fastedge/v1/binaries" + if self._client._base_url_overridden + else "https://api.gcore.com//fastedge/v1/binaries", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -119,7 +123,9 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/fastedge/v1/binaries/{id}", + f"/fastedge/v1/binaries/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/binaries/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -150,7 +156,9 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/fastedge/v1/binaries/{id}", + f"/fastedge/v1/binaries/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/binaries/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -203,7 +211,9 @@ async def create( """ extra_headers = {"Content-Type": "application/octet-stream", **(extra_headers or {})} return await self._post( - "/fastedge/v1/binaries/raw", + "/fastedge/v1/binaries/raw" + if self._client._base_url_overridden + else "https://api.gcore.com//fastedge/v1/binaries/raw", body=await async_read_file_content(body), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -223,7 +233,9 @@ async def list( ) -> BinaryListResponse: """List binaries""" return await self._get( - "/fastedge/v1/binaries", + "/fastedge/v1/binaries" + if self._client._base_url_overridden + else "https://api.gcore.com//fastedge/v1/binaries", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -255,7 +267,9 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/fastedge/v1/binaries/{id}", + f"/fastedge/v1/binaries/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/binaries/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -286,7 +300,9 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/fastedge/v1/binaries/{id}", + f"/fastedge/v1/binaries/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/binaries/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/fastedge/fastedge.py b/src/gcore/resources/fastedge/fastedge.py index 9b052788..e52b5216 100644 --- a/src/gcore/resources/fastedge/fastedge.py +++ b/src/gcore/resources/fastedge/fastedge.py @@ -123,7 +123,7 @@ def get_account_overview( ) -> Client: """Get status and limits for the client""" return self._get( - "/fastedge/v1/me", + "/fastedge/v1/me" if self._client._base_url_overridden else "https://api.gcore.com//fastedge/v1/me", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -187,7 +187,7 @@ async def get_account_overview( ) -> Client: """Get status and limits for the client""" return await self._get( - "/fastedge/v1/me", + "/fastedge/v1/me" if self._client._base_url_overridden else "https://api.gcore.com//fastedge/v1/me", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/fastedge/kv_stores.py b/src/gcore/resources/fastedge/kv_stores.py index cb007bbc..17cd738d 100644 --- a/src/gcore/resources/fastedge/kv_stores.py +++ b/src/gcore/resources/fastedge/kv_stores.py @@ -72,7 +72,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/fastedge/v1/kv", + "/fastedge/v1/kv" if self._client._base_url_overridden else "https://api.gcore.com//fastedge/v1/kv", body=maybe_transform( { "byod": byod, @@ -112,7 +112,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/fastedge/v1/kv", + "/fastedge/v1/kv" if self._client._base_url_overridden else "https://api.gcore.com//fastedge/v1/kv", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -148,7 +148,9 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/fastedge/v1/kv/{id}", + f"/fastedge/v1/kv/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/kv/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -179,7 +181,9 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/fastedge/v1/kv/{id}", + f"/fastedge/v1/kv/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/kv/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -216,7 +220,9 @@ def replace( timeout: Override the client-level default timeout for this request, in seconds """ return self._put( - f"/fastedge/v1/kv/{id}", + f"/fastedge/v1/kv/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/kv/{id}", body=maybe_transform( { "byod": byod, @@ -280,7 +286,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/fastedge/v1/kv", + "/fastedge/v1/kv" if self._client._base_url_overridden else "https://api.gcore.com//fastedge/v1/kv", body=await async_maybe_transform( { "byod": byod, @@ -320,7 +326,7 @@ async def list( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/fastedge/v1/kv", + "/fastedge/v1/kv" if self._client._base_url_overridden else "https://api.gcore.com//fastedge/v1/kv", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -356,7 +362,9 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/fastedge/v1/kv/{id}", + f"/fastedge/v1/kv/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/kv/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -387,7 +395,9 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/fastedge/v1/kv/{id}", + f"/fastedge/v1/kv/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/kv/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -424,7 +434,9 @@ async def replace( timeout: Override the client-level default timeout for this request, in seconds """ return await self._put( - f"/fastedge/v1/kv/{id}", + f"/fastedge/v1/kv/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/kv/{id}", body=await async_maybe_transform( { "byod": byod, diff --git a/src/gcore/resources/fastedge/secrets.py b/src/gcore/resources/fastedge/secrets.py index 8b1e97e2..beee5a6a 100644 --- a/src/gcore/resources/fastedge/secrets.py +++ b/src/gcore/resources/fastedge/secrets.py @@ -83,7 +83,9 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/fastedge/v1/secrets", + "/fastedge/v1/secrets" + if self._client._base_url_overridden + else "https://api.gcore.com//fastedge/v1/secrets", body=maybe_transform( { "name": name, @@ -131,7 +133,9 @@ def update( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/fastedge/v1/secrets/{id}", + f"/fastedge/v1/secrets/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/secrets/{id}", body=maybe_transform( { "comment": comment, @@ -175,7 +179,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/fastedge/v1/secrets", + "/fastedge/v1/secrets" + if self._client._base_url_overridden + else "https://api.gcore.com//fastedge/v1/secrets", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -220,7 +226,9 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/fastedge/v1/secrets/{id}", + f"/fastedge/v1/secrets/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/secrets/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -255,7 +263,9 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/fastedge/v1/secrets/{id}", + f"/fastedge/v1/secrets/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/secrets/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -295,7 +305,9 @@ def replace( timeout: Override the client-level default timeout for this request, in seconds """ return self._put( - f"/fastedge/v1/secrets/{id}", + f"/fastedge/v1/secrets/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/secrets/{id}", body=maybe_transform( { "name": name, @@ -363,7 +375,9 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/fastedge/v1/secrets", + "/fastedge/v1/secrets" + if self._client._base_url_overridden + else "https://api.gcore.com//fastedge/v1/secrets", body=await async_maybe_transform( { "name": name, @@ -411,7 +425,9 @@ async def update( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/fastedge/v1/secrets/{id}", + f"/fastedge/v1/secrets/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/secrets/{id}", body=await async_maybe_transform( { "comment": comment, @@ -455,7 +471,9 @@ async def list( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/fastedge/v1/secrets", + "/fastedge/v1/secrets" + if self._client._base_url_overridden + else "https://api.gcore.com//fastedge/v1/secrets", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -500,7 +518,9 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/fastedge/v1/secrets/{id}", + f"/fastedge/v1/secrets/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/secrets/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -535,7 +555,9 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/fastedge/v1/secrets/{id}", + f"/fastedge/v1/secrets/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/secrets/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -575,7 +597,9 @@ async def replace( timeout: Override the client-level default timeout for this request, in seconds """ return await self._put( - f"/fastedge/v1/secrets/{id}", + f"/fastedge/v1/secrets/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/secrets/{id}", body=await async_maybe_transform( { "name": name, diff --git a/src/gcore/resources/fastedge/statistics.py b/src/gcore/resources/fastedge/statistics.py index 1958aafc..9bc2a7ba 100644 --- a/src/gcore/resources/fastedge/statistics.py +++ b/src/gcore/resources/fastedge/statistics.py @@ -83,7 +83,9 @@ def get_call_series( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/fastedge/v1/stats/calls", + "/fastedge/v1/stats/calls" + if self._client._base_url_overridden + else "https://api.gcore.com//fastedge/v1/stats/calls", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -141,7 +143,9 @@ def get_duration_series( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/fastedge/v1/stats/app_duration", + "/fastedge/v1/stats/app_duration" + if self._client._base_url_overridden + else "https://api.gcore.com//fastedge/v1/stats/app_duration", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -220,7 +224,9 @@ async def get_call_series( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/fastedge/v1/stats/calls", + "/fastedge/v1/stats/calls" + if self._client._base_url_overridden + else "https://api.gcore.com//fastedge/v1/stats/calls", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -278,7 +284,9 @@ async def get_duration_series( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/fastedge/v1/stats/app_duration", + "/fastedge/v1/stats/app_duration" + if self._client._base_url_overridden + else "https://api.gcore.com//fastedge/v1/stats/app_duration", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/fastedge/templates.py b/src/gcore/resources/fastedge/templates.py index a39e2757..78413275 100644 --- a/src/gcore/resources/fastedge/templates.py +++ b/src/gcore/resources/fastedge/templates.py @@ -93,7 +93,9 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/fastedge/v1/template", + "/fastedge/v1/template" + if self._client._base_url_overridden + else "https://api.gcore.com//fastedge/v1/template", body=maybe_transform( { "binary_id": binary_id, @@ -149,7 +151,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/fastedge/v1/template", + "/fastedge/v1/template" + if self._client._base_url_overridden + else "https://api.gcore.com//fastedge/v1/template", page=SyncOffsetPageFastedgeTemplates[TemplateShort], options=make_request_options( extra_headers=extra_headers, @@ -197,7 +201,9 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/fastedge/v1/template/{id}", + f"/fastedge/v1/template/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/template/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -232,7 +238,9 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/fastedge/v1/template/{id}", + f"/fastedge/v1/template/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/template/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -281,7 +289,9 @@ def replace( timeout: Override the client-level default timeout for this request, in seconds """ return self._put( - f"/fastedge/v1/template/{id}", + f"/fastedge/v1/template/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/template/{id}", body=maybe_transform( { "binary_id": binary_id, @@ -361,7 +371,9 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/fastedge/v1/template", + "/fastedge/v1/template" + if self._client._base_url_overridden + else "https://api.gcore.com//fastedge/v1/template", body=await async_maybe_transform( { "binary_id": binary_id, @@ -417,7 +429,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/fastedge/v1/template", + "/fastedge/v1/template" + if self._client._base_url_overridden + else "https://api.gcore.com//fastedge/v1/template", page=AsyncOffsetPageFastedgeTemplates[TemplateShort], options=make_request_options( extra_headers=extra_headers, @@ -465,7 +479,9 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/fastedge/v1/template/{id}", + f"/fastedge/v1/template/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/template/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -500,7 +516,9 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/fastedge/v1/template/{id}", + f"/fastedge/v1/template/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/template/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -549,7 +567,9 @@ async def replace( timeout: Override the client-level default timeout for this request, in seconds """ return await self._put( - f"/fastedge/v1/template/{id}", + f"/fastedge/v1/template/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//fastedge/v1/template/{id}", body=await async_maybe_transform( { "binary_id": binary_id, diff --git a/src/gcore/resources/iam/api_tokens.py b/src/gcore/resources/iam/api_tokens.py index ecd59cb6..8e771ad5 100644 --- a/src/gcore/resources/iam/api_tokens.py +++ b/src/gcore/resources/iam/api_tokens.py @@ -80,7 +80,9 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - f"/iam/clients/{client_id}/tokens", + f"/iam/clients/{client_id}/tokens" + if self._client._base_url_overridden + else f"https://api.gcore.com//iam/clients/{client_id}/tokens", body=maybe_transform( { "client_user": client_user, @@ -147,7 +149,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/iam/clients/{client_id}/tokens", + f"/iam/clients/{client_id}/tokens" + if self._client._base_url_overridden + else f"https://api.gcore.com//iam/clients/{client_id}/tokens", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -196,7 +200,9 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/iam/clients/{client_id}/tokens/{token_id}", + f"/iam/clients/{client_id}/tokens/{token_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//iam/clients/{client_id}/tokens/{token_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -228,7 +234,9 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/iam/clients/{client_id}/tokens/{token_id}", + f"/iam/clients/{client_id}/tokens/{token_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//iam/clients/{client_id}/tokens/{token_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -293,7 +301,9 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - f"/iam/clients/{client_id}/tokens", + f"/iam/clients/{client_id}/tokens" + if self._client._base_url_overridden + else f"https://api.gcore.com//iam/clients/{client_id}/tokens", body=await async_maybe_transform( { "client_user": client_user, @@ -360,7 +370,9 @@ async def list( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/iam/clients/{client_id}/tokens", + f"/iam/clients/{client_id}/tokens" + if self._client._base_url_overridden + else f"https://api.gcore.com//iam/clients/{client_id}/tokens", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -409,7 +421,9 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/iam/clients/{client_id}/tokens/{token_id}", + f"/iam/clients/{client_id}/tokens/{token_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//iam/clients/{client_id}/tokens/{token_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -441,7 +455,9 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/iam/clients/{client_id}/tokens/{token_id}", + f"/iam/clients/{client_id}/tokens/{token_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//iam/clients/{client_id}/tokens/{token_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/iam/iam.py b/src/gcore/resources/iam/iam.py index 54b4653f..e6fb22d8 100644 --- a/src/gcore/resources/iam/iam.py +++ b/src/gcore/resources/iam/iam.py @@ -75,7 +75,7 @@ def get_account_overview( ) -> AccountOverview: """Get information about your profile, users and other account details.""" return self._get( - "/iam/clients/me", + "/iam/clients/me" if self._client._base_url_overridden else "https://api.gcore.com//iam/clients/me", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -123,7 +123,7 @@ async def get_account_overview( ) -> AccountOverview: """Get information about your profile, users and other account details.""" return await self._get( - "/iam/clients/me", + "/iam/clients/me" if self._client._base_url_overridden else "https://api.gcore.com//iam/clients/me", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/iam/users.py b/src/gcore/resources/iam/users.py index a27021c1..5f0cf949 100644 --- a/src/gcore/resources/iam/users.py +++ b/src/gcore/resources/iam/users.py @@ -101,7 +101,9 @@ def update( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/iam/users/{user_id}", + f"/iam/users/{user_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//iam/users/{user_id}", body=maybe_transform( { "auth_types": auth_types, @@ -152,7 +154,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/iam/users", + "/iam/users" if self._client._base_url_overridden else "https://api.gcore.com//iam/users", page=SyncOffsetPage[User], options=make_request_options( extra_headers=extra_headers, @@ -198,7 +200,9 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/iam/clients/{client_id}/client-users/{user_id}", + f"/iam/clients/{client_id}/client-users/{user_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//iam/clients/{client_id}/client-users/{user_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -229,7 +233,9 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/iam/users/{user_id}", + f"/iam/users/{user_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//iam/users/{user_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -275,7 +281,9 @@ def invite( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/iam/clients/invite_user", + "/iam/clients/invite_user" + if self._client._base_url_overridden + else "https://api.gcore.com//iam/clients/invite_user", body=maybe_transform( { "client_id": client_id, @@ -366,7 +374,9 @@ async def update( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/iam/users/{user_id}", + f"/iam/users/{user_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//iam/users/{user_id}", body=await async_maybe_transform( { "auth_types": auth_types, @@ -417,7 +427,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/iam/users", + "/iam/users" if self._client._base_url_overridden else "https://api.gcore.com//iam/users", page=AsyncOffsetPage[User], options=make_request_options( extra_headers=extra_headers, @@ -463,7 +473,9 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/iam/clients/{client_id}/client-users/{user_id}", + f"/iam/clients/{client_id}/client-users/{user_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//iam/clients/{client_id}/client-users/{user_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -494,7 +506,9 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/iam/users/{user_id}", + f"/iam/users/{user_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//iam/users/{user_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -540,7 +554,9 @@ async def invite( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/iam/clients/invite_user", + "/iam/clients/invite_user" + if self._client._base_url_overridden + else "https://api.gcore.com//iam/clients/invite_user", body=await async_maybe_transform( { "client_id": client_id, diff --git a/src/gcore/resources/security/bgp_announces.py b/src/gcore/resources/security/bgp_announces.py index 43947fab..fdbb1d33 100644 --- a/src/gcore/resources/security/bgp_announces.py +++ b/src/gcore/resources/security/bgp_announces.py @@ -74,7 +74,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/security/sifter/v2/protected_addresses/announces", + "/security/sifter/v2/protected_addresses/announces" + if self._client._base_url_overridden + else "https://api.gcore.com//security/sifter/v2/protected_addresses/announces", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -122,7 +124,9 @@ def toggle( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/security/sifter/v2/protected_addresses/announces", + "/security/sifter/v2/protected_addresses/announces" + if self._client._base_url_overridden + else "https://api.gcore.com//security/sifter/v2/protected_addresses/announces", body=maybe_transform( { "announce": announce, @@ -191,7 +195,9 @@ async def list( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/security/sifter/v2/protected_addresses/announces", + "/security/sifter/v2/protected_addresses/announces" + if self._client._base_url_overridden + else "https://api.gcore.com//security/sifter/v2/protected_addresses/announces", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -239,7 +245,9 @@ async def toggle( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/security/sifter/v2/protected_addresses/announces", + "/security/sifter/v2/protected_addresses/announces" + if self._client._base_url_overridden + else "https://api.gcore.com//security/sifter/v2/protected_addresses/announces", body=await async_maybe_transform( { "announce": announce, diff --git a/src/gcore/resources/security/events.py b/src/gcore/resources/security/events.py index 86d387bb..98c34908 100644 --- a/src/gcore/resources/security/events.py +++ b/src/gcore/resources/security/events.py @@ -88,7 +88,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/security/notifier/v1/event_logs", + "/security/notifier/v1/event_logs" + if self._client._base_url_overridden + else "https://api.gcore.com//security/notifier/v1/event_logs", page=SyncOffsetPage[ClientView], options=make_request_options( extra_headers=extra_headers, @@ -174,7 +176,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/security/notifier/v1/event_logs", + "/security/notifier/v1/event_logs" + if self._client._base_url_overridden + else "https://api.gcore.com//security/notifier/v1/event_logs", page=AsyncOffsetPage[ClientView], options=make_request_options( extra_headers=extra_headers, diff --git a/src/gcore/resources/security/profile_templates.py b/src/gcore/resources/security/profile_templates.py index 85b84ad8..79719fd7 100644 --- a/src/gcore/resources/security/profile_templates.py +++ b/src/gcore/resources/security/profile_templates.py @@ -55,7 +55,9 @@ def list( profile. Client receives only common and created for him profile templates. """ return self._get( - "/security/iaas/profile-templates", + "/security/iaas/profile-templates" + if self._client._base_url_overridden + else "https://api.gcore.com//security/iaas/profile-templates", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -99,7 +101,9 @@ async def list( profile. Client receives only common and created for him profile templates. """ return await self._get( - "/security/iaas/profile-templates", + "/security/iaas/profile-templates" + if self._client._base_url_overridden + else "https://api.gcore.com//security/iaas/profile-templates", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/security/profiles.py b/src/gcore/resources/security/profiles.py index 16668afa..b3cd1183 100644 --- a/src/gcore/resources/security/profiles.py +++ b/src/gcore/resources/security/profiles.py @@ -78,7 +78,9 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/security/iaas/v2/profiles", + "/security/iaas/v2/profiles" + if self._client._base_url_overridden + else "https://api.gcore.com//security/iaas/v2/profiles", body=maybe_transform( { "fields": fields, @@ -122,7 +124,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/security/iaas/v2/profiles", + "/security/iaas/v2/profiles" + if self._client._base_url_overridden + else "https://api.gcore.com//security/iaas/v2/profiles", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -168,7 +172,9 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/security/iaas/v2/profiles/{id}", + f"/security/iaas/v2/profiles/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//security/iaas/v2/profiles/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -199,7 +205,9 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/security/iaas/v2/profiles/{id}", + f"/security/iaas/v2/profiles/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//security/iaas/v2/profiles/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -234,7 +242,9 @@ def recreate( timeout: Override the client-level default timeout for this request, in seconds """ return self._put( - f"/security/iaas/v2/profiles/{id}/recreate", + f"/security/iaas/v2/profiles/{id}/recreate" + if self._client._base_url_overridden + else f"https://api.gcore.com//security/iaas/v2/profiles/{id}/recreate", body=maybe_transform( { "fields": fields, @@ -280,7 +290,9 @@ def replace( timeout: Override the client-level default timeout for this request, in seconds """ return self._put( - f"/security/iaas/v2/profiles/{id}", + f"/security/iaas/v2/profiles/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//security/iaas/v2/profiles/{id}", body=maybe_transform( { "fields": fields, @@ -346,7 +358,9 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/security/iaas/v2/profiles", + "/security/iaas/v2/profiles" + if self._client._base_url_overridden + else "https://api.gcore.com//security/iaas/v2/profiles", body=await async_maybe_transform( { "fields": fields, @@ -390,7 +404,9 @@ async def list( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/security/iaas/v2/profiles", + "/security/iaas/v2/profiles" + if self._client._base_url_overridden + else "https://api.gcore.com//security/iaas/v2/profiles", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -436,7 +452,9 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/security/iaas/v2/profiles/{id}", + f"/security/iaas/v2/profiles/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//security/iaas/v2/profiles/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -467,7 +485,9 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/security/iaas/v2/profiles/{id}", + f"/security/iaas/v2/profiles/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//security/iaas/v2/profiles/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -502,7 +522,9 @@ async def recreate( timeout: Override the client-level default timeout for this request, in seconds """ return await self._put( - f"/security/iaas/v2/profiles/{id}/recreate", + f"/security/iaas/v2/profiles/{id}/recreate" + if self._client._base_url_overridden + else f"https://api.gcore.com//security/iaas/v2/profiles/{id}/recreate", body=await async_maybe_transform( { "fields": fields, @@ -548,7 +570,9 @@ async def replace( timeout: Override the client-level default timeout for this request, in seconds """ return await self._put( - f"/security/iaas/v2/profiles/{id}", + f"/security/iaas/v2/profiles/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//security/iaas/v2/profiles/{id}", body=await async_maybe_transform( { "fields": fields, diff --git a/src/gcore/resources/storage/buckets/buckets.py b/src/gcore/resources/storage/buckets/buckets.py index d8c41393..cd7d3047 100644 --- a/src/gcore/resources/storage/buckets/buckets.py +++ b/src/gcore/resources/storage/buckets/buckets.py @@ -108,7 +108,9 @@ def create( raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -148,7 +150,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/storage/provisioning/v2/storage/{storage_id}/s3/buckets", + f"/storage/provisioning/v2/storage/{storage_id}/s3/buckets" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v2/storage/{storage_id}/s3/buckets", page=SyncOffsetPage[Bucket], options=make_request_options( extra_headers=extra_headers, @@ -196,7 +200,9 @@ def delete( raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -266,7 +272,9 @@ async def create( raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -306,7 +314,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/storage/provisioning/v2/storage/{storage_id}/s3/buckets", + f"/storage/provisioning/v2/storage/{storage_id}/s3/buckets" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v2/storage/{storage_id}/s3/buckets", page=AsyncOffsetPage[Bucket], options=make_request_options( extra_headers=extra_headers, @@ -354,7 +364,9 @@ async def delete( raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/storage/buckets/cors.py b/src/gcore/resources/storage/buckets/cors.py index 3869e78e..d00928da 100644 --- a/src/gcore/resources/storage/buckets/cors.py +++ b/src/gcore/resources/storage/buckets/cors.py @@ -74,7 +74,9 @@ def create( raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/cors", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/cors" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/cors", body=maybe_transform({"allowed_origins": allowed_origins}, cor_create_params.CorCreateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -111,7 +113,9 @@ def get( if not bucket_name: raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") return self._get( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/cors", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/cors" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/cors", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -172,7 +176,9 @@ async def create( raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/cors", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/cors" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/cors", body=await async_maybe_transform({"allowed_origins": allowed_origins}, cor_create_params.CorCreateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -209,7 +215,9 @@ async def get( if not bucket_name: raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") return await self._get( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/cors", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/cors" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/cors", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/storage/buckets/lifecycle.py b/src/gcore/resources/storage/buckets/lifecycle.py index a4940ef7..8e7f3d81 100644 --- a/src/gcore/resources/storage/buckets/lifecycle.py +++ b/src/gcore/resources/storage/buckets/lifecycle.py @@ -78,7 +78,9 @@ def create( raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/lifecycle", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/lifecycle" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/lifecycle", body=maybe_transform({"expiration_days": expiration_days}, lifecycle_create_params.LifecycleCreateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -115,7 +117,9 @@ def delete( raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/lifecycle", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/lifecycle" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/lifecycle", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -181,7 +185,9 @@ async def create( raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/lifecycle", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/lifecycle" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/lifecycle", body=await async_maybe_transform( {"expiration_days": expiration_days}, lifecycle_create_params.LifecycleCreateParams ), @@ -220,7 +226,9 @@ async def delete( raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/lifecycle", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/lifecycle" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/lifecycle", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/storage/buckets/policy.py b/src/gcore/resources/storage/buckets/policy.py index f84d2653..7b89c11b 100644 --- a/src/gcore/resources/storage/buckets/policy.py +++ b/src/gcore/resources/storage/buckets/policy.py @@ -71,7 +71,9 @@ def create( raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -109,7 +111,9 @@ def delete( raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -144,7 +148,9 @@ def get( if not bucket_name: raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") return self._get( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -204,7 +210,9 @@ async def create( raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -242,7 +250,9 @@ async def delete( raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -277,7 +287,9 @@ async def get( if not bucket_name: raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") return await self._get( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/storage/credentials.py b/src/gcore/resources/storage/credentials.py index 5cc7224a..ef93c1d2 100644 --- a/src/gcore/resources/storage/credentials.py +++ b/src/gcore/resources/storage/credentials.py @@ -85,7 +85,9 @@ def recreate( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - f"/storage/provisioning/v1/storage/{storage_id}/credentials", + f"/storage/provisioning/v1/storage/{storage_id}/credentials" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/credentials", body=maybe_transform( { "delete_sftp_password": delete_sftp_password, @@ -167,7 +169,9 @@ async def recreate( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - f"/storage/provisioning/v1/storage/{storage_id}/credentials", + f"/storage/provisioning/v1/storage/{storage_id}/credentials" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/credentials", body=await async_maybe_transform( { "delete_sftp_password": delete_sftp_password, diff --git a/src/gcore/resources/storage/locations.py b/src/gcore/resources/storage/locations.py index 5e2a2d96..9d7c6670 100644 --- a/src/gcore/resources/storage/locations.py +++ b/src/gcore/resources/storage/locations.py @@ -69,7 +69,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/storage/provisioning/v2/locations", + "/storage/provisioning/v2/locations" + if self._client._base_url_overridden + else "https://api.gcore.com//storage/provisioning/v2/locations", page=SyncOffsetPage[Location], options=make_request_options( extra_headers=extra_headers, @@ -135,7 +137,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/storage/provisioning/v2/locations", + "/storage/provisioning/v2/locations" + if self._client._base_url_overridden + else "https://api.gcore.com//storage/provisioning/v2/locations", page=AsyncOffsetPage[Location], options=make_request_options( extra_headers=extra_headers, diff --git a/src/gcore/resources/storage/statistics.py b/src/gcore/resources/storage/statistics.py index 980c1410..334749eb 100644 --- a/src/gcore/resources/storage/statistics.py +++ b/src/gcore/resources/storage/statistics.py @@ -82,7 +82,9 @@ def get_usage_aggregated( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/storage/stats/v1/storage/usage/total", + "/storage/stats/v1/storage/usage/total" + if self._client._base_url_overridden + else "https://api.gcore.com//storage/stats/v1/storage/usage/total", body=maybe_transform( { "from_": from_, @@ -149,7 +151,9 @@ def get_usage_series( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/storage/stats/v1/storage/usage/series", + "/storage/stats/v1/storage/usage/series" + if self._client._base_url_overridden + else "https://api.gcore.com//storage/stats/v1/storage/usage/series", body=maybe_transform( { "from_": from_, @@ -229,7 +233,9 @@ async def get_usage_aggregated( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/storage/stats/v1/storage/usage/total", + "/storage/stats/v1/storage/usage/total" + if self._client._base_url_overridden + else "https://api.gcore.com//storage/stats/v1/storage/usage/total", body=await async_maybe_transform( { "from_": from_, @@ -296,7 +302,9 @@ async def get_usage_series( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/storage/stats/v1/storage/usage/series", + "/storage/stats/v1/storage/usage/series" + if self._client._base_url_overridden + else "https://api.gcore.com//storage/stats/v1/storage/usage/series", body=await async_maybe_transform( { "from_": from_, diff --git a/src/gcore/resources/storage/storage.py b/src/gcore/resources/storage/storage.py index 9326bb88..e56f0531 100644 --- a/src/gcore/resources/storage/storage.py +++ b/src/gcore/resources/storage/storage.py @@ -138,7 +138,9 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/storage/provisioning/v2/storage", + "/storage/provisioning/v2/storage" + if self._client._base_url_overridden + else "https://api.gcore.com//storage/provisioning/v2/storage", body=maybe_transform( { "location": location, @@ -188,7 +190,9 @@ def update( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/storage/provisioning/v2/storage/{storage_id}", + f"/storage/provisioning/v2/storage/{storage_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v2/storage/{storage_id}", body=maybe_transform( { "expires": expires, @@ -258,7 +262,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/storage/provisioning/v3/storage", + "/storage/provisioning/v3/storage" + if self._client._base_url_overridden + else "https://api.gcore.com//storage/provisioning/v3/storage", page=SyncOffsetPage[Storage], options=make_request_options( extra_headers=extra_headers, @@ -310,7 +316,9 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/storage/provisioning/v1/storage/{storage_id}", + f"/storage/provisioning/v1/storage/{storage_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -342,7 +350,9 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/storage/provisioning/v1/storage/{storage_id}", + f"/storage/provisioning/v1/storage/{storage_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -377,7 +387,9 @@ def link_ssh_key( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - f"/storage/provisioning/v1/storage/{storage_id}/key/{key_id}/link", + f"/storage/provisioning/v1/storage/{storage_id}/key/{key_id}/link" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/key/{key_id}/link", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -411,7 +423,9 @@ def restore( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - f"/storage/provisioning/v1/storage/{storage_id}/restore", + f"/storage/provisioning/v1/storage/{storage_id}/restore" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/restore", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -450,7 +464,9 @@ def unlink_ssh_key( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - f"/storage/provisioning/v1/storage/{storage_id}/key/{key_id}/unlink", + f"/storage/provisioning/v1/storage/{storage_id}/key/{key_id}/unlink" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/key/{key_id}/unlink", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -540,7 +556,9 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/storage/provisioning/v2/storage", + "/storage/provisioning/v2/storage" + if self._client._base_url_overridden + else "https://api.gcore.com//storage/provisioning/v2/storage", body=await async_maybe_transform( { "location": location, @@ -590,7 +608,9 @@ async def update( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/storage/provisioning/v2/storage/{storage_id}", + f"/storage/provisioning/v2/storage/{storage_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v2/storage/{storage_id}", body=await async_maybe_transform( { "expires": expires, @@ -660,7 +680,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/storage/provisioning/v3/storage", + "/storage/provisioning/v3/storage" + if self._client._base_url_overridden + else "https://api.gcore.com//storage/provisioning/v3/storage", page=AsyncOffsetPage[Storage], options=make_request_options( extra_headers=extra_headers, @@ -712,7 +734,9 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/storage/provisioning/v1/storage/{storage_id}", + f"/storage/provisioning/v1/storage/{storage_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -744,7 +768,9 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/storage/provisioning/v1/storage/{storage_id}", + f"/storage/provisioning/v1/storage/{storage_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -779,7 +805,9 @@ async def link_ssh_key( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - f"/storage/provisioning/v1/storage/{storage_id}/key/{key_id}/link", + f"/storage/provisioning/v1/storage/{storage_id}/key/{key_id}/link" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/key/{key_id}/link", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -813,7 +841,9 @@ async def restore( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - f"/storage/provisioning/v1/storage/{storage_id}/restore", + f"/storage/provisioning/v1/storage/{storage_id}/restore" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/restore", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -854,7 +884,9 @@ async def unlink_ssh_key( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - f"/storage/provisioning/v1/storage/{storage_id}/key/{key_id}/unlink", + f"/storage/provisioning/v1/storage/{storage_id}/key/{key_id}/unlink" + if self._client._base_url_overridden + else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/key/{key_id}/unlink", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/streaming/ai_tasks.py b/src/gcore/resources/streaming/ai_tasks.py index 0b63144c..02cb29a4 100644 --- a/src/gcore/resources/streaming/ai_tasks.py +++ b/src/gcore/resources/streaming/ai_tasks.py @@ -319,7 +319,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/streaming/ai/tasks", + "/streaming/ai/tasks" if self._client._base_url_overridden else "https://api.gcore.com//streaming/ai/tasks", body=maybe_transform( { "task_name": task_name, @@ -400,7 +400,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/streaming/ai/tasks", + "/streaming/ai/tasks" if self._client._base_url_overridden else "https://api.gcore.com//streaming/ai/tasks", page=SyncPageStreamingAI[AITask], options=make_request_options( extra_headers=extra_headers, @@ -451,7 +451,9 @@ def cancel( if not task_id: raise ValueError(f"Expected a non-empty value for `task_id` but received {task_id!r}") return self._post( - f"/streaming/ai/tasks/{task_id}/cancel", + f"/streaming/ai/tasks/{task_id}/cancel" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/ai/tasks/{task_id}/cancel", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -518,7 +520,9 @@ def get( if not task_id: raise ValueError(f"Expected a non-empty value for `task_id` but received {task_id!r}") return self._get( - f"/streaming/ai/tasks/{task_id}", + f"/streaming/ai/tasks/{task_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/ai/tasks/{task_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -590,7 +594,7 @@ def get_ai_settings( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/ai/info", + "/streaming/ai/info" if self._client._base_url_overridden else "https://api.gcore.com//streaming/ai/info", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -900,7 +904,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/streaming/ai/tasks", + "/streaming/ai/tasks" if self._client._base_url_overridden else "https://api.gcore.com//streaming/ai/tasks", body=await async_maybe_transform( { "task_name": task_name, @@ -981,7 +985,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/streaming/ai/tasks", + "/streaming/ai/tasks" if self._client._base_url_overridden else "https://api.gcore.com//streaming/ai/tasks", page=AsyncPageStreamingAI[AITask], options=make_request_options( extra_headers=extra_headers, @@ -1032,7 +1036,9 @@ async def cancel( if not task_id: raise ValueError(f"Expected a non-empty value for `task_id` but received {task_id!r}") return await self._post( - f"/streaming/ai/tasks/{task_id}/cancel", + f"/streaming/ai/tasks/{task_id}/cancel" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/ai/tasks/{task_id}/cancel", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1099,7 +1105,9 @@ async def get( if not task_id: raise ValueError(f"Expected a non-empty value for `task_id` but received {task_id!r}") return await self._get( - f"/streaming/ai/tasks/{task_id}", + f"/streaming/ai/tasks/{task_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/ai/tasks/{task_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1171,7 +1179,7 @@ async def get_ai_settings( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/ai/info", + "/streaming/ai/info" if self._client._base_url_overridden else "https://api.gcore.com//streaming/ai/info", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/streaming/broadcasts.py b/src/gcore/resources/streaming/broadcasts.py index d8ef434b..9461d5b2 100644 --- a/src/gcore/resources/streaming/broadcasts.py +++ b/src/gcore/resources/streaming/broadcasts.py @@ -76,7 +76,9 @@ def create( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - "/streaming/broadcasts", + "/streaming/broadcasts" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/broadcasts", body=maybe_transform({"broadcast": broadcast}, broadcast_create_params.BroadcastCreateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -109,7 +111,9 @@ def update( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/streaming/broadcasts/{broadcast_id}", + f"/streaming/broadcasts/{broadcast_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/broadcasts/{broadcast_id}", body=maybe_transform({"broadcast": broadcast}, broadcast_update_params.BroadcastUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -146,7 +150,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/streaming/broadcasts", + "/streaming/broadcasts" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/broadcasts", page=SyncPageStreaming[Broadcast], options=make_request_options( extra_headers=extra_headers, @@ -183,7 +189,9 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/streaming/broadcasts/{broadcast_id}", + f"/streaming/broadcasts/{broadcast_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/broadcasts/{broadcast_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -214,7 +222,9 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/broadcasts/{broadcast_id}", + f"/streaming/broadcasts/{broadcast_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/broadcasts/{broadcast_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -245,7 +255,9 @@ def get_spectators_count( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/broadcasts/{broadcast_id}/spectators", + f"/streaming/broadcasts/{broadcast_id}/spectators" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/broadcasts/{broadcast_id}/spectators", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -306,7 +318,9 @@ async def create( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - "/streaming/broadcasts", + "/streaming/broadcasts" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/broadcasts", body=await async_maybe_transform({"broadcast": broadcast}, broadcast_create_params.BroadcastCreateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -339,7 +353,9 @@ async def update( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/streaming/broadcasts/{broadcast_id}", + f"/streaming/broadcasts/{broadcast_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/broadcasts/{broadcast_id}", body=await async_maybe_transform({"broadcast": broadcast}, broadcast_update_params.BroadcastUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -376,7 +392,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/streaming/broadcasts", + "/streaming/broadcasts" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/broadcasts", page=AsyncPageStreaming[Broadcast], options=make_request_options( extra_headers=extra_headers, @@ -413,7 +431,9 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/streaming/broadcasts/{broadcast_id}", + f"/streaming/broadcasts/{broadcast_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/broadcasts/{broadcast_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -444,7 +464,9 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/broadcasts/{broadcast_id}", + f"/streaming/broadcasts/{broadcast_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/broadcasts/{broadcast_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -475,7 +497,9 @@ async def get_spectators_count( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/broadcasts/{broadcast_id}/spectators", + f"/streaming/broadcasts/{broadcast_id}/spectators" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/broadcasts/{broadcast_id}/spectators", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/streaming/directories.py b/src/gcore/resources/streaming/directories.py index 438d9de8..345cfc7a 100644 --- a/src/gcore/resources/streaming/directories.py +++ b/src/gcore/resources/streaming/directories.py @@ -72,7 +72,9 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/streaming/directories", + "/streaming/directories" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/directories", body=maybe_transform( { "name": name, @@ -117,7 +119,9 @@ def update( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/streaming/directories/{directory_id}", + f"/streaming/directories/{directory_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/directories/{directory_id}", body=maybe_transform( { "name": name, @@ -163,7 +167,9 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/streaming/directories/{directory_id}", + f"/streaming/directories/{directory_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/directories/{directory_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -196,7 +202,9 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/directories/{directory_id}", + f"/streaming/directories/{directory_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/directories/{directory_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -219,7 +227,9 @@ def get_tree( directories in video hosting. """ return self._get( - "/streaming/directories/tree", + "/streaming/directories/tree" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/directories/tree", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -276,7 +286,9 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/streaming/directories", + "/streaming/directories" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/directories", body=await async_maybe_transform( { "name": name, @@ -321,7 +333,9 @@ async def update( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/streaming/directories/{directory_id}", + f"/streaming/directories/{directory_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/directories/{directory_id}", body=await async_maybe_transform( { "name": name, @@ -367,7 +381,9 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/streaming/directories/{directory_id}", + f"/streaming/directories/{directory_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/directories/{directory_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -400,7 +416,9 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/directories/{directory_id}", + f"/streaming/directories/{directory_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/directories/{directory_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -423,7 +441,9 @@ async def get_tree( directories in video hosting. """ return await self._get( - "/streaming/directories/tree", + "/streaming/directories/tree" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/directories/tree", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/streaming/players.py b/src/gcore/resources/streaming/players.py index 826e015a..942e32b9 100644 --- a/src/gcore/resources/streaming/players.py +++ b/src/gcore/resources/streaming/players.py @@ -72,7 +72,7 @@ def create( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - "/streaming/players", + "/streaming/players" if self._client._base_url_overridden else "https://api.gcore.com//streaming/players", body=maybe_transform({"player": player}, player_create_params.PlayerCreateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -109,7 +109,9 @@ def update( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/streaming/players/{player_id}", + f"/streaming/players/{player_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/players/{player_id}", body=maybe_transform({"player": player}, player_update_params.PlayerUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -144,7 +146,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/streaming/players", + "/streaming/players" if self._client._base_url_overridden else "https://api.gcore.com//streaming/players", page=SyncPageStreaming[Player], options=make_request_options( extra_headers=extra_headers, @@ -181,7 +183,9 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/streaming/players/{player_id}", + f"/streaming/players/{player_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/players/{player_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -212,7 +216,9 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/players/{player_id}", + f"/streaming/players/{player_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/players/{player_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -244,7 +250,9 @@ def preview( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._get( - f"/streaming/players/{player_id}/preview", + f"/streaming/players/{player_id}/preview" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/players/{player_id}/preview", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -301,7 +309,7 @@ async def create( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - "/streaming/players", + "/streaming/players" if self._client._base_url_overridden else "https://api.gcore.com//streaming/players", body=await async_maybe_transform({"player": player}, player_create_params.PlayerCreateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -338,7 +346,9 @@ async def update( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/streaming/players/{player_id}", + f"/streaming/players/{player_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/players/{player_id}", body=await async_maybe_transform({"player": player}, player_update_params.PlayerUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -373,7 +383,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/streaming/players", + "/streaming/players" if self._client._base_url_overridden else "https://api.gcore.com//streaming/players", page=AsyncPageStreaming[Player], options=make_request_options( extra_headers=extra_headers, @@ -410,7 +420,9 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/streaming/players/{player_id}", + f"/streaming/players/{player_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/players/{player_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -441,7 +453,9 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/players/{player_id}", + f"/streaming/players/{player_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/players/{player_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -473,7 +487,9 @@ async def preview( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._get( - f"/streaming/players/{player_id}/preview", + f"/streaming/players/{player_id}/preview" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/players/{player_id}/preview", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/streaming/playlists.py b/src/gcore/resources/streaming/playlists.py index fba76526..c9b9c691 100644 --- a/src/gcore/resources/streaming/playlists.py +++ b/src/gcore/resources/streaming/playlists.py @@ -204,7 +204,9 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/streaming/playlists", + "/streaming/playlists" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/playlists", body=maybe_transform( { "active": active, @@ -335,7 +337,9 @@ def update( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/streaming/playlists/{playlist_id}", + f"/streaming/playlists/{playlist_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/playlists/{playlist_id}", body=maybe_transform( { "active": active, @@ -388,7 +392,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/streaming/playlists", + "/streaming/playlists" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/playlists", page=SyncPageStreaming[Playlist], options=make_request_options( extra_headers=extra_headers, @@ -425,7 +431,9 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/streaming/playlists/{playlist_id}", + f"/streaming/playlists/{playlist_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/playlists/{playlist_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -456,7 +464,9 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/playlists/{playlist_id}", + f"/streaming/playlists/{playlist_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/playlists/{playlist_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -487,7 +497,9 @@ def list_videos( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/playlists/{playlist_id}/videos", + f"/streaming/playlists/{playlist_id}/videos" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/playlists/{playlist_id}/videos", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -672,7 +684,9 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/streaming/playlists", + "/streaming/playlists" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/playlists", body=await async_maybe_transform( { "active": active, @@ -803,7 +817,9 @@ async def update( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/streaming/playlists/{playlist_id}", + f"/streaming/playlists/{playlist_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/playlists/{playlist_id}", body=await async_maybe_transform( { "active": active, @@ -856,7 +872,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/streaming/playlists", + "/streaming/playlists" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/playlists", page=AsyncPageStreaming[Playlist], options=make_request_options( extra_headers=extra_headers, @@ -893,7 +911,9 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/streaming/playlists/{playlist_id}", + f"/streaming/playlists/{playlist_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/playlists/{playlist_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -924,7 +944,9 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/playlists/{playlist_id}", + f"/streaming/playlists/{playlist_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/playlists/{playlist_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -955,7 +977,9 @@ async def list_videos( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/playlists/{playlist_id}/videos", + f"/streaming/playlists/{playlist_id}/videos" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/playlists/{playlist_id}/videos", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/streaming/quality_sets.py b/src/gcore/resources/streaming/quality_sets.py index 825c12da..a80ce0b3 100644 --- a/src/gcore/resources/streaming/quality_sets.py +++ b/src/gcore/resources/streaming/quality_sets.py @@ -91,7 +91,9 @@ def list( is a paid feature. """ return self._get( - "/streaming/quality_sets", + "/streaming/quality_sets" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/quality_sets", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -137,7 +139,9 @@ def set_default( timeout: Override the client-level default timeout for this request, in seconds """ return self._put( - "/streaming/quality_sets/default", + "/streaming/quality_sets/default" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/quality_sets/default", body=maybe_transform( { "live": live, @@ -222,7 +226,9 @@ async def list( is a paid feature. """ return await self._get( - "/streaming/quality_sets", + "/streaming/quality_sets" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/quality_sets", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -268,7 +274,9 @@ async def set_default( timeout: Override the client-level default timeout for this request, in seconds """ return await self._put( - "/streaming/quality_sets/default", + "/streaming/quality_sets/default" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/quality_sets/default", body=await async_maybe_transform( { "live": live, diff --git a/src/gcore/resources/streaming/restreams.py b/src/gcore/resources/streaming/restreams.py index 78880ed4..1d703166 100644 --- a/src/gcore/resources/streaming/restreams.py +++ b/src/gcore/resources/streaming/restreams.py @@ -67,7 +67,9 @@ def create( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - "/streaming/restreams", + "/streaming/restreams" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/restreams", body=maybe_transform({"restream": restream}, restream_create_params.RestreamCreateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -100,7 +102,9 @@ def update( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/streaming/restreams/{restream_id}", + f"/streaming/restreams/{restream_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/restreams/{restream_id}", body=maybe_transform({"restream": restream}, restream_update_params.RestreamUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -135,7 +139,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/streaming/restreams", + "/streaming/restreams" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/restreams", page=SyncPageStreaming[Restream], options=make_request_options( extra_headers=extra_headers, @@ -172,7 +178,9 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/streaming/restreams/{restream_id}", + f"/streaming/restreams/{restream_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/restreams/{restream_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -203,7 +211,9 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/restreams/{restream_id}", + f"/streaming/restreams/{restream_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/restreams/{restream_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -256,7 +266,9 @@ async def create( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - "/streaming/restreams", + "/streaming/restreams" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/restreams", body=await async_maybe_transform({"restream": restream}, restream_create_params.RestreamCreateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -289,7 +301,9 @@ async def update( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/streaming/restreams/{restream_id}", + f"/streaming/restreams/{restream_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/restreams/{restream_id}", body=await async_maybe_transform({"restream": restream}, restream_update_params.RestreamUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -324,7 +338,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/streaming/restreams", + "/streaming/restreams" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/restreams", page=AsyncPageStreaming[Restream], options=make_request_options( extra_headers=extra_headers, @@ -361,7 +377,9 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/streaming/restreams/{restream_id}", + f"/streaming/restreams/{restream_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/restreams/{restream_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -392,7 +410,9 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/restreams/{restream_id}", + f"/streaming/restreams/{restream_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/restreams/{restream_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/streaming/statistics.py b/src/gcore/resources/streaming/statistics.py index 4e8cb182..2b5e440d 100644 --- a/src/gcore/resources/streaming/statistics.py +++ b/src/gcore/resources/streaming/statistics.py @@ -123,7 +123,9 @@ def get_ffprobes( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/ffprobe", + "/streaming/statistics/ffprobe" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/ffprobe", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -188,7 +190,9 @@ def get_live_unique_viewers( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/stream/viewers", + "/streaming/statistics/stream/viewers" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/stream/viewers", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -254,7 +258,9 @@ def get_live_watch_time_cdn( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/stream/watching_duration", + "/streaming/statistics/stream/watching_duration" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/stream/watching_duration", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -315,7 +321,9 @@ def get_live_watch_time_total_cdn( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/stream/watching_duration/total", + "/streaming/statistics/stream/watching_duration/total" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/stream/watching_duration/total", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -368,7 +376,9 @@ def get_max_streams_series( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/max_stream", + "/streaming/statistics/max_stream" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/max_stream", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -421,7 +431,9 @@ def get_popular_videos( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/popular", + "/streaming/statistics/popular" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/popular", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -472,7 +484,9 @@ def get_storage_series( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/storage", + "/streaming/statistics/storage" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/storage", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -524,7 +538,9 @@ def get_stream_series( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/stream", + "/streaming/statistics/stream" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/stream", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -597,7 +613,9 @@ def get_unique_viewers( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/uniqs", + "/streaming/statistics/uniqs" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/uniqs", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -684,7 +702,9 @@ def get_unique_viewers_cdn( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/cdn/uniqs", + "/streaming/statistics/cdn/uniqs" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/cdn/uniqs", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -758,7 +778,9 @@ def get_views( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/views", + "/streaming/statistics/views" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/views", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -815,7 +837,9 @@ def get_views_by_browsers( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/browsers", + "/streaming/statistics/browsers" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/browsers", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -866,7 +890,9 @@ def get_views_by_country( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/countries", + "/streaming/statistics/countries" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/countries", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -917,7 +943,9 @@ def get_views_by_hostname( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/hosts", + "/streaming/statistics/hosts" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/hosts", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -968,7 +996,9 @@ def get_views_by_operating_system( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/systems", + "/streaming/statistics/systems" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/systems", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1019,7 +1049,9 @@ def get_views_by_referer( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/embeds", + "/streaming/statistics/embeds" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/embeds", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1070,7 +1102,9 @@ def get_views_by_region( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/regions", + "/streaming/statistics/regions" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/regions", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1130,7 +1164,9 @@ def get_views_heatmap( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/heatmap", + "/streaming/statistics/heatmap" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/heatmap", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1180,7 +1216,9 @@ def get_vod_storage_volume( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/vod/storage_duration", + "/streaming/statistics/vod/storage_duration" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/vod/storage_duration", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1228,7 +1266,9 @@ def get_vod_transcoding_duration( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/vod/transcoding_duration", + "/streaming/statistics/vod/transcoding_duration" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/vod/transcoding_duration", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1289,7 +1329,9 @@ def get_vod_unique_viewers_cdn( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/vod/viewers", + "/streaming/statistics/vod/viewers" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/vod/viewers", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1355,7 +1397,9 @@ def get_vod_watch_time_cdn( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/vod/watching_duration", + "/streaming/statistics/vod/watching_duration" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/vod/watching_duration", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1416,7 +1460,9 @@ def get_vod_watch_time_total_cdn( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/vod/watching_duration/total", + "/streaming/statistics/vod/watching_duration/total" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/vod/watching_duration/total", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1493,7 +1539,9 @@ async def get_ffprobes( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/ffprobe", + "/streaming/statistics/ffprobe" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/ffprobe", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1558,7 +1606,9 @@ async def get_live_unique_viewers( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/stream/viewers", + "/streaming/statistics/stream/viewers" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/stream/viewers", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1624,7 +1674,9 @@ async def get_live_watch_time_cdn( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/stream/watching_duration", + "/streaming/statistics/stream/watching_duration" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/stream/watching_duration", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1685,7 +1737,9 @@ async def get_live_watch_time_total_cdn( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/stream/watching_duration/total", + "/streaming/statistics/stream/watching_duration/total" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/stream/watching_duration/total", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1738,7 +1792,9 @@ async def get_max_streams_series( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/max_stream", + "/streaming/statistics/max_stream" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/max_stream", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1791,7 +1847,9 @@ async def get_popular_videos( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/popular", + "/streaming/statistics/popular" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/popular", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1842,7 +1900,9 @@ async def get_storage_series( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/storage", + "/streaming/statistics/storage" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/storage", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1894,7 +1954,9 @@ async def get_stream_series( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/stream", + "/streaming/statistics/stream" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/stream", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1967,7 +2029,9 @@ async def get_unique_viewers( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/uniqs", + "/streaming/statistics/uniqs" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/uniqs", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2054,7 +2118,9 @@ async def get_unique_viewers_cdn( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/cdn/uniqs", + "/streaming/statistics/cdn/uniqs" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/cdn/uniqs", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2128,7 +2194,9 @@ async def get_views( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/views", + "/streaming/statistics/views" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/views", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2185,7 +2253,9 @@ async def get_views_by_browsers( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/browsers", + "/streaming/statistics/browsers" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/browsers", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2236,7 +2306,9 @@ async def get_views_by_country( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/countries", + "/streaming/statistics/countries" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/countries", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2287,7 +2359,9 @@ async def get_views_by_hostname( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/hosts", + "/streaming/statistics/hosts" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/hosts", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2338,7 +2412,9 @@ async def get_views_by_operating_system( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/systems", + "/streaming/statistics/systems" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/systems", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2389,7 +2465,9 @@ async def get_views_by_referer( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/embeds", + "/streaming/statistics/embeds" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/embeds", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2440,7 +2518,9 @@ async def get_views_by_region( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/regions", + "/streaming/statistics/regions" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/regions", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2500,7 +2580,9 @@ async def get_views_heatmap( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/heatmap", + "/streaming/statistics/heatmap" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/heatmap", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2550,7 +2632,9 @@ async def get_vod_storage_volume( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/vod/storage_duration", + "/streaming/statistics/vod/storage_duration" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/vod/storage_duration", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2598,7 +2682,9 @@ async def get_vod_transcoding_duration( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/vod/transcoding_duration", + "/streaming/statistics/vod/transcoding_duration" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/vod/transcoding_duration", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2659,7 +2745,9 @@ async def get_vod_unique_viewers_cdn( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/vod/viewers", + "/streaming/statistics/vod/viewers" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/vod/viewers", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2725,7 +2813,9 @@ async def get_vod_watch_time_cdn( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/vod/watching_duration", + "/streaming/statistics/vod/watching_duration" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/vod/watching_duration", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2786,7 +2876,9 @@ async def get_vod_watch_time_total_cdn( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/vod/watching_duration/total", + "/streaming/statistics/vod/watching_duration/total" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/statistics/vod/watching_duration/total", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/streaming/streams/overlays.py b/src/gcore/resources/streaming/streams/overlays.py index f52cfee4..58dfaf62 100644 --- a/src/gcore/resources/streaming/streams/overlays.py +++ b/src/gcore/resources/streaming/streams/overlays.py @@ -123,7 +123,9 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - f"/streaming/streams/{stream_id}/overlays", + f"/streaming/streams/{stream_id}/overlays" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/streams/{stream_id}/overlays", body=maybe_transform(body, Iterable[overlay_create_params.Body]), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -175,7 +177,9 @@ def update( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/streaming/streams/{stream_id}/overlays/{overlay_id}", + f"/streaming/streams/{stream_id}/overlays/{overlay_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/streams/{stream_id}/overlays/{overlay_id}", body=maybe_transform( { "height": height, @@ -217,7 +221,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/streams/{stream_id}/overlays", + f"/streaming/streams/{stream_id}/overlays" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/streams/{stream_id}/overlays", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -250,7 +256,9 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/streaming/streams/{stream_id}/overlays/{overlay_id}", + f"/streaming/streams/{stream_id}/overlays/{overlay_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/streams/{stream_id}/overlays/{overlay_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -282,7 +290,9 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/streams/{stream_id}/overlays/{overlay_id}", + f"/streaming/streams/{stream_id}/overlays/{overlay_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/streams/{stream_id}/overlays/{overlay_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -314,7 +324,9 @@ def update_multiple( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/streaming/streams/{stream_id}/overlays", + f"/streaming/streams/{stream_id}/overlays" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/streams/{stream_id}/overlays", body=maybe_transform(body, Iterable[overlay_update_multiple_params.Body]), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -420,7 +432,9 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - f"/streaming/streams/{stream_id}/overlays", + f"/streaming/streams/{stream_id}/overlays" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/streams/{stream_id}/overlays", body=await async_maybe_transform(body, Iterable[overlay_create_params.Body]), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -472,7 +486,9 @@ async def update( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/streaming/streams/{stream_id}/overlays/{overlay_id}", + f"/streaming/streams/{stream_id}/overlays/{overlay_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/streams/{stream_id}/overlays/{overlay_id}", body=await async_maybe_transform( { "height": height, @@ -514,7 +530,9 @@ async def list( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/streams/{stream_id}/overlays", + f"/streaming/streams/{stream_id}/overlays" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/streams/{stream_id}/overlays", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -547,7 +565,9 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/streaming/streams/{stream_id}/overlays/{overlay_id}", + f"/streaming/streams/{stream_id}/overlays/{overlay_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/streams/{stream_id}/overlays/{overlay_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -579,7 +599,9 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/streams/{stream_id}/overlays/{overlay_id}", + f"/streaming/streams/{stream_id}/overlays/{overlay_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/streams/{stream_id}/overlays/{overlay_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -611,7 +633,9 @@ async def update_multiple( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/streaming/streams/{stream_id}/overlays", + f"/streaming/streams/{stream_id}/overlays" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/streams/{stream_id}/overlays", body=await async_maybe_transform(body, Iterable[overlay_update_multiple_params.Body]), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout diff --git a/src/gcore/resources/streaming/streams/streams.py b/src/gcore/resources/streaming/streams/streams.py index 30c0c23b..06bc5dcc 100644 --- a/src/gcore/resources/streaming/streams/streams.py +++ b/src/gcore/resources/streaming/streams/streams.py @@ -232,7 +232,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/streaming/streams", + "/streaming/streams" if self._client._base_url_overridden else "https://api.gcore.com//streaming/streams", body=maybe_transform( { "name": name, @@ -285,7 +285,9 @@ def update( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/streaming/streams/{stream_id}", + f"/streaming/streams/{stream_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/streams/{stream_id}", body=maybe_transform({"stream": stream}, stream_update_params.StreamUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -324,7 +326,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/streaming/streams", + "/streaming/streams" if self._client._base_url_overridden else "https://api.gcore.com//streaming/streams", page=SyncPageStreaming[Stream], options=make_request_options( extra_headers=extra_headers, @@ -383,7 +385,9 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/streaming/streams/{stream_id}", + f"/streaming/streams/{stream_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/streams/{stream_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -415,7 +419,9 @@ def clear_dvr( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._put( - f"/streaming/streams/{stream_id}/dvr_cleanup", + f"/streaming/streams/{stream_id}/dvr_cleanup" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/streams/{stream_id}/dvr_cleanup", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -523,7 +529,9 @@ def create_clip( timeout: Override the client-level default timeout for this request, in seconds """ return self._put( - f"/streaming/streams/{stream_id}/clip_recording", + f"/streaming/streams/{stream_id}/clip_recording" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/streams/{stream_id}/clip_recording", body=maybe_transform( { "duration": duration, @@ -563,7 +571,9 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/streams/{stream_id}", + f"/streaming/streams/{stream_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/streams/{stream_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -612,7 +622,9 @@ def list_clips( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/streams/{stream_id}/clip_recording", + f"/streaming/streams/{stream_id}/clip_recording" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/streams/{stream_id}/clip_recording", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -680,7 +692,9 @@ def start_recording( timeout: Override the client-level default timeout for this request, in seconds """ return self._put( - f"/streaming/streams/{stream_id}/start_recording", + f"/streaming/streams/{stream_id}/start_recording" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/streams/{stream_id}/start_recording", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -717,7 +731,9 @@ def stop_recording( timeout: Override the client-level default timeout for this request, in seconds """ return self._put( - f"/streaming/streams/{stream_id}/stop_recording", + f"/streaming/streams/{stream_id}/stop_recording" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/streams/{stream_id}/stop_recording", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -915,7 +931,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/streaming/streams", + "/streaming/streams" if self._client._base_url_overridden else "https://api.gcore.com//streaming/streams", body=await async_maybe_transform( { "name": name, @@ -968,7 +984,9 @@ async def update( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/streaming/streams/{stream_id}", + f"/streaming/streams/{stream_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/streams/{stream_id}", body=await async_maybe_transform({"stream": stream}, stream_update_params.StreamUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -1007,7 +1025,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/streaming/streams", + "/streaming/streams" if self._client._base_url_overridden else "https://api.gcore.com//streaming/streams", page=AsyncPageStreaming[Stream], options=make_request_options( extra_headers=extra_headers, @@ -1066,7 +1084,9 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/streaming/streams/{stream_id}", + f"/streaming/streams/{stream_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/streams/{stream_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1098,7 +1118,9 @@ async def clear_dvr( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._put( - f"/streaming/streams/{stream_id}/dvr_cleanup", + f"/streaming/streams/{stream_id}/dvr_cleanup" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/streams/{stream_id}/dvr_cleanup", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1206,7 +1228,9 @@ async def create_clip( timeout: Override the client-level default timeout for this request, in seconds """ return await self._put( - f"/streaming/streams/{stream_id}/clip_recording", + f"/streaming/streams/{stream_id}/clip_recording" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/streams/{stream_id}/clip_recording", body=await async_maybe_transform( { "duration": duration, @@ -1246,7 +1270,9 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/streams/{stream_id}", + f"/streaming/streams/{stream_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/streams/{stream_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1295,7 +1321,9 @@ async def list_clips( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/streams/{stream_id}/clip_recording", + f"/streaming/streams/{stream_id}/clip_recording" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/streams/{stream_id}/clip_recording", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1363,7 +1391,9 @@ async def start_recording( timeout: Override the client-level default timeout for this request, in seconds """ return await self._put( - f"/streaming/streams/{stream_id}/start_recording", + f"/streaming/streams/{stream_id}/start_recording" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/streams/{stream_id}/start_recording", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1400,7 +1430,9 @@ async def stop_recording( timeout: Override the client-level default timeout for this request, in seconds """ return await self._put( - f"/streaming/streams/{stream_id}/stop_recording", + f"/streaming/streams/{stream_id}/stop_recording" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/streams/{stream_id}/stop_recording", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/streaming/videos/subtitles.py b/src/gcore/resources/streaming/videos/subtitles.py index 4e59615e..165594a4 100644 --- a/src/gcore/resources/streaming/videos/subtitles.py +++ b/src/gcore/resources/streaming/videos/subtitles.py @@ -120,7 +120,9 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - f"/streaming/videos/{video_id}/subtitles", + f"/streaming/videos/{video_id}/subtitles" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/videos/{video_id}/subtitles", body=maybe_transform(body, subtitle_create_params.SubtitleCreateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -170,7 +172,9 @@ def update( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/streaming/videos/{video_id}/subtitles/{id}", + f"/streaming/videos/{video_id}/subtitles/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/videos/{video_id}/subtitles/{id}", body=maybe_transform( { "language": language, @@ -209,7 +213,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/videos/{video_id}/subtitles", + f"/streaming/videos/{video_id}/subtitles" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/videos/{video_id}/subtitles", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -242,7 +248,9 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/streaming/videos/{video_id}/subtitles/{id}", + f"/streaming/videos/{video_id}/subtitles/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/videos/{video_id}/subtitles/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -274,7 +282,9 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/videos/{video_id}/subtitles/{id}", + f"/streaming/videos/{video_id}/subtitles/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/videos/{video_id}/subtitles/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -379,7 +389,9 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - f"/streaming/videos/{video_id}/subtitles", + f"/streaming/videos/{video_id}/subtitles" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/videos/{video_id}/subtitles", body=await async_maybe_transform(body, subtitle_create_params.SubtitleCreateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -429,7 +441,9 @@ async def update( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/streaming/videos/{video_id}/subtitles/{id}", + f"/streaming/videos/{video_id}/subtitles/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/videos/{video_id}/subtitles/{id}", body=await async_maybe_transform( { "language": language, @@ -468,7 +482,9 @@ async def list( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/videos/{video_id}/subtitles", + f"/streaming/videos/{video_id}/subtitles" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/videos/{video_id}/subtitles", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -501,7 +517,9 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/streaming/videos/{video_id}/subtitles/{id}", + f"/streaming/videos/{video_id}/subtitles/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/videos/{video_id}/subtitles/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -533,7 +551,9 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/videos/{video_id}/subtitles/{id}", + f"/streaming/videos/{video_id}/subtitles/{id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/videos/{video_id}/subtitles/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/streaming/videos/videos.py b/src/gcore/resources/streaming/videos/videos.py index c77320db..3b1cfbef 100644 --- a/src/gcore/resources/streaming/videos/videos.py +++ b/src/gcore/resources/streaming/videos/videos.py @@ -148,7 +148,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/streaming/videos", + "/streaming/videos" if self._client._base_url_overridden else "https://api.gcore.com//streaming/videos", body=maybe_transform({"video": video}, video_create_params.VideoCreateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -371,7 +371,9 @@ def update( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/streaming/videos/{video_id}", + f"/streaming/videos/{video_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/videos/{video_id}", body=maybe_transform( { "name": name, @@ -467,7 +469,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/streaming/videos", + "/streaming/videos" if self._client._base_url_overridden else "https://api.gcore.com//streaming/videos", page=SyncPageStreaming[Video], options=make_request_options( extra_headers=extra_headers, @@ -524,7 +526,9 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/streaming/videos/{video_id}", + f"/streaming/videos/{video_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/videos/{video_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -575,7 +579,9 @@ def create_multiple( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/streaming/videos/batch", + "/streaming/videos/batch" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/videos/batch", body=maybe_transform({"videos": videos}, video_create_multiple_params.VideoCreateMultipleParams), options=make_request_options( extra_headers=extra_headers, @@ -625,7 +631,9 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/videos/{video_id}", + f"/streaming/videos/{video_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/videos/{video_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -685,7 +693,9 @@ def get_parameters_for_direct_upload( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/videos/{video_id}/upload", + f"/streaming/videos/{video_id}/upload" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/videos/{video_id}/upload", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -719,7 +729,9 @@ def list_names( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._get( - "/streaming/videos/names", + "/streaming/videos/names" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/videos/names", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -836,7 +848,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/streaming/videos", + "/streaming/videos" if self._client._base_url_overridden else "https://api.gcore.com//streaming/videos", body=await async_maybe_transform({"video": video}, video_create_params.VideoCreateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -1059,7 +1071,9 @@ async def update( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/streaming/videos/{video_id}", + f"/streaming/videos/{video_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/videos/{video_id}", body=await async_maybe_transform( { "name": name, @@ -1155,7 +1169,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/streaming/videos", + "/streaming/videos" if self._client._base_url_overridden else "https://api.gcore.com//streaming/videos", page=AsyncPageStreaming[Video], options=make_request_options( extra_headers=extra_headers, @@ -1212,7 +1226,9 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/streaming/videos/{video_id}", + f"/streaming/videos/{video_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/videos/{video_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1263,7 +1279,9 @@ async def create_multiple( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/streaming/videos/batch", + "/streaming/videos/batch" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/videos/batch", body=await async_maybe_transform( {"videos": videos}, video_create_multiple_params.VideoCreateMultipleParams ), @@ -1317,7 +1335,9 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/videos/{video_id}", + f"/streaming/videos/{video_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/videos/{video_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1377,7 +1397,9 @@ async def get_parameters_for_direct_upload( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/videos/{video_id}/upload", + f"/streaming/videos/{video_id}/upload" + if self._client._base_url_overridden + else f"https://api.gcore.com//streaming/videos/{video_id}/upload", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1411,7 +1433,9 @@ async def list_names( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._get( - "/streaming/videos/names", + "/streaming/videos/names" + if self._client._base_url_overridden + else "https://api.gcore.com//streaming/videos/names", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/waap/advanced_rules.py b/src/gcore/resources/waap/advanced_rules.py index 30c32c1c..96f15cca 100644 --- a/src/gcore/resources/waap/advanced_rules.py +++ b/src/gcore/resources/waap/advanced_rules.py @@ -51,7 +51,9 @@ def list( ) -> WaapAdvancedRuleDescriptorList: """Retrieve an advanced rules descriptor""" return self._get( - "/waap/v1/advanced-rules/descriptor", + "/waap/v1/advanced-rules/descriptor" + if self._client._base_url_overridden + else "https://api.gcore.com//waap/v1/advanced-rules/descriptor", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -91,7 +93,9 @@ async def list( ) -> WaapAdvancedRuleDescriptorList: """Retrieve an advanced rules descriptor""" return await self._get( - "/waap/v1/advanced-rules/descriptor", + "/waap/v1/advanced-rules/descriptor" + if self._client._base_url_overridden + else "https://api.gcore.com//waap/v1/advanced-rules/descriptor", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/waap/custom_page_sets.py b/src/gcore/resources/waap/custom_page_sets.py index 7ce6dca4..9be46769 100644 --- a/src/gcore/resources/waap/custom_page_sets.py +++ b/src/gcore/resources/waap/custom_page_sets.py @@ -88,7 +88,9 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/waap/v1/custom-page-sets", + "/waap/v1/custom-page-sets" + if self._client._base_url_overridden + else "https://api.gcore.com//waap/v1/custom-page-sets", body=maybe_transform( { "name": name, @@ -152,7 +154,9 @@ def update( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._patch( - f"/waap/v1/custom-page-sets/{set_id}", + f"/waap/v1/custom-page-sets/{set_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/custom-page-sets/{set_id}", body=maybe_transform( { "block": block, @@ -210,7 +214,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/waap/v1/custom-page-sets", + "/waap/v1/custom-page-sets" + if self._client._base_url_overridden + else "https://api.gcore.com//waap/v1/custom-page-sets", page=SyncOffsetPage[WaapCustomPageSet], options=make_request_options( extra_headers=extra_headers, @@ -258,7 +264,9 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/waap/v1/custom-page-sets/{set_id}", + f"/waap/v1/custom-page-sets/{set_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/custom-page-sets/{set_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -291,7 +299,9 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/waap/v1/custom-page-sets/{set_id}", + f"/waap/v1/custom-page-sets/{set_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/custom-page-sets/{set_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -349,7 +359,9 @@ def preview( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/waap/v1/preview-custom-page", + "/waap/v1/preview-custom-page" + if self._client._base_url_overridden + else "https://api.gcore.com//waap/v1/preview-custom-page", body=maybe_transform( { "error": error, @@ -430,7 +442,9 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/waap/v1/custom-page-sets", + "/waap/v1/custom-page-sets" + if self._client._base_url_overridden + else "https://api.gcore.com//waap/v1/custom-page-sets", body=await async_maybe_transform( { "name": name, @@ -494,7 +508,9 @@ async def update( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._patch( - f"/waap/v1/custom-page-sets/{set_id}", + f"/waap/v1/custom-page-sets/{set_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/custom-page-sets/{set_id}", body=await async_maybe_transform( { "block": block, @@ -552,7 +568,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/waap/v1/custom-page-sets", + "/waap/v1/custom-page-sets" + if self._client._base_url_overridden + else "https://api.gcore.com//waap/v1/custom-page-sets", page=AsyncOffsetPage[WaapCustomPageSet], options=make_request_options( extra_headers=extra_headers, @@ -600,7 +618,9 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/waap/v1/custom-page-sets/{set_id}", + f"/waap/v1/custom-page-sets/{set_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/custom-page-sets/{set_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -633,7 +653,9 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/waap/v1/custom-page-sets/{set_id}", + f"/waap/v1/custom-page-sets/{set_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/custom-page-sets/{set_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -691,7 +713,9 @@ async def preview( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/waap/v1/preview-custom-page", + "/waap/v1/preview-custom-page" + if self._client._base_url_overridden + else "https://api.gcore.com//waap/v1/preview-custom-page", body=await async_maybe_transform( { "error": error, diff --git a/src/gcore/resources/waap/domains/advanced_rules.py b/src/gcore/resources/waap/domains/advanced_rules.py index e22a838f..6afde6d6 100644 --- a/src/gcore/resources/waap/domains/advanced_rules.py +++ b/src/gcore/resources/waap/domains/advanced_rules.py @@ -97,7 +97,9 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - f"/waap/v1/domains/{domain_id}/advanced-rules", + f"/waap/v1/domains/{domain_id}/advanced-rules" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/advanced-rules", body=maybe_transform( { "action": action, @@ -171,7 +173,9 @@ def update( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._patch( - f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/advanced-rules/{rule_id}", body=maybe_transform( { "action": action, @@ -261,7 +265,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/advanced-rules", + f"/waap/v1/domains/{domain_id}/advanced-rules" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/advanced-rules", page=SyncOffsetPage[WaapAdvancedRule], options=make_request_options( extra_headers=extra_headers, @@ -315,7 +321,9 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/advanced-rules/{rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -351,7 +359,9 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/advanced-rules/{rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -393,7 +403,9 @@ def toggle( raise ValueError(f"Expected a non-empty value for `action` but received {action!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._patch( - f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}/{action}", + f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}/{action}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/advanced-rules/{rule_id}/{action}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -473,7 +485,9 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - f"/waap/v1/domains/{domain_id}/advanced-rules", + f"/waap/v1/domains/{domain_id}/advanced-rules" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/advanced-rules", body=await async_maybe_transform( { "action": action, @@ -547,7 +561,9 @@ async def update( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._patch( - f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/advanced-rules/{rule_id}", body=await async_maybe_transform( { "action": action, @@ -637,7 +653,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/advanced-rules", + f"/waap/v1/domains/{domain_id}/advanced-rules" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/advanced-rules", page=AsyncOffsetPage[WaapAdvancedRule], options=make_request_options( extra_headers=extra_headers, @@ -691,7 +709,9 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/advanced-rules/{rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -727,7 +747,9 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/advanced-rules/{rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -769,7 +791,9 @@ async def toggle( raise ValueError(f"Expected a non-empty value for `action` but received {action!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._patch( - f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}/{action}", + f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}/{action}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/advanced-rules/{rule_id}/{action}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/waap/domains/api_discovery.py b/src/gcore/resources/waap/domains/api_discovery.py index 6b1f7896..ccd8a883 100644 --- a/src/gcore/resources/waap/domains/api_discovery.py +++ b/src/gcore/resources/waap/domains/api_discovery.py @@ -82,7 +82,9 @@ def get_scan_result( if not scan_id: raise ValueError(f"Expected a non-empty value for `scan_id` but received {scan_id!r}") return self._get( - f"/waap/v1/domains/{domain_id}/api-discovery/scan-results/{scan_id}", + f"/waap/v1/domains/{domain_id}/api-discovery/scan-results/{scan_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-discovery/scan-results/{scan_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -115,7 +117,9 @@ def get_settings( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/waap/v1/domains/{domain_id}/api-discovery/settings", + f"/waap/v1/domains/{domain_id}/api-discovery/settings" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-discovery/settings", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -180,7 +184,9 @@ def list_scan_results( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/api-discovery/scan-results", + f"/waap/v1/domains/{domain_id}/api-discovery/scan-results" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-discovery/scan-results", page=SyncOffsetPage[WaapAPIScanResult], options=make_request_options( extra_headers=extra_headers, @@ -231,7 +237,9 @@ def scan_openapi( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - f"/waap/v1/domains/{domain_id}/api-discovery/scan", + f"/waap/v1/domains/{domain_id}/api-discovery/scan" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-discovery/scan", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -281,7 +289,9 @@ def update_settings( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/waap/v1/domains/{domain_id}/api-discovery/settings", + f"/waap/v1/domains/{domain_id}/api-discovery/settings" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-discovery/settings", body=maybe_transform( { "description_file_location": description_file_location, @@ -334,7 +344,9 @@ def upload_openapi( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - f"/waap/v1/domains/{domain_id}/api-discovery/upload", + f"/waap/v1/domains/{domain_id}/api-discovery/upload" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-discovery/upload", body=maybe_transform( { "file_data": file_data, @@ -400,7 +412,9 @@ async def get_scan_result( if not scan_id: raise ValueError(f"Expected a non-empty value for `scan_id` but received {scan_id!r}") return await self._get( - f"/waap/v1/domains/{domain_id}/api-discovery/scan-results/{scan_id}", + f"/waap/v1/domains/{domain_id}/api-discovery/scan-results/{scan_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-discovery/scan-results/{scan_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -433,7 +447,9 @@ async def get_settings( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/waap/v1/domains/{domain_id}/api-discovery/settings", + f"/waap/v1/domains/{domain_id}/api-discovery/settings" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-discovery/settings", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -498,7 +514,9 @@ def list_scan_results( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/api-discovery/scan-results", + f"/waap/v1/domains/{domain_id}/api-discovery/scan-results" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-discovery/scan-results", page=AsyncOffsetPage[WaapAPIScanResult], options=make_request_options( extra_headers=extra_headers, @@ -549,7 +567,9 @@ async def scan_openapi( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - f"/waap/v1/domains/{domain_id}/api-discovery/scan", + f"/waap/v1/domains/{domain_id}/api-discovery/scan" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-discovery/scan", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -599,7 +619,9 @@ async def update_settings( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/waap/v1/domains/{domain_id}/api-discovery/settings", + f"/waap/v1/domains/{domain_id}/api-discovery/settings" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-discovery/settings", body=await async_maybe_transform( { "description_file_location": description_file_location, @@ -652,7 +674,9 @@ async def upload_openapi( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - f"/waap/v1/domains/{domain_id}/api-discovery/upload", + f"/waap/v1/domains/{domain_id}/api-discovery/upload" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-discovery/upload", body=await async_maybe_transform( { "file_data": file_data, diff --git a/src/gcore/resources/waap/domains/api_path_groups.py b/src/gcore/resources/waap/domains/api_path_groups.py index 3e66ea27..cf0c40e5 100644 --- a/src/gcore/resources/waap/domains/api_path_groups.py +++ b/src/gcore/resources/waap/domains/api_path_groups.py @@ -65,7 +65,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/waap/v1/domains/{domain_id}/api-path-groups", + f"/waap/v1/domains/{domain_id}/api-path-groups" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-path-groups", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -119,7 +121,9 @@ async def list( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/waap/v1/domains/{domain_id}/api-path-groups", + f"/waap/v1/domains/{domain_id}/api-path-groups" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-path-groups", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/waap/domains/api_paths.py b/src/gcore/resources/waap/domains/api_paths.py index fc1dd68c..d372c33b 100644 --- a/src/gcore/resources/waap/domains/api_paths.py +++ b/src/gcore/resources/waap/domains/api_paths.py @@ -90,7 +90,9 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - f"/waap/v1/domains/{domain_id}/api-paths", + f"/waap/v1/domains/{domain_id}/api-paths" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-paths", body=maybe_transform( { "http_scheme": http_scheme, @@ -153,7 +155,9 @@ def update( raise ValueError(f"Expected a non-empty value for `path_id` but received {path_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._patch( - f"/waap/v1/domains/{domain_id}/api-paths/{path_id}", + f"/waap/v1/domains/{domain_id}/api-paths/{path_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-paths/{path_id}", body=maybe_transform( { "api_groups": api_groups, @@ -250,7 +254,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/api-paths", + f"/waap/v1/domains/{domain_id}/api-paths" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-paths", page=SyncOffsetPage[WaapAPIPath], options=make_request_options( extra_headers=extra_headers, @@ -309,7 +315,9 @@ def delete( raise ValueError(f"Expected a non-empty value for `path_id` but received {path_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/waap/v1/domains/{domain_id}/api-paths/{path_id}", + f"/waap/v1/domains/{domain_id}/api-paths/{path_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-paths/{path_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -347,7 +355,9 @@ def get( if not path_id: raise ValueError(f"Expected a non-empty value for `path_id` but received {path_id!r}") return self._get( - f"/waap/v1/domains/{domain_id}/api-paths/{path_id}", + f"/waap/v1/domains/{domain_id}/api-paths/{path_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-paths/{path_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -420,7 +430,9 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - f"/waap/v1/domains/{domain_id}/api-paths", + f"/waap/v1/domains/{domain_id}/api-paths" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-paths", body=await async_maybe_transform( { "http_scheme": http_scheme, @@ -483,7 +495,9 @@ async def update( raise ValueError(f"Expected a non-empty value for `path_id` but received {path_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._patch( - f"/waap/v1/domains/{domain_id}/api-paths/{path_id}", + f"/waap/v1/domains/{domain_id}/api-paths/{path_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-paths/{path_id}", body=await async_maybe_transform( { "api_groups": api_groups, @@ -580,7 +594,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/api-paths", + f"/waap/v1/domains/{domain_id}/api-paths" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-paths", page=AsyncOffsetPage[WaapAPIPath], options=make_request_options( extra_headers=extra_headers, @@ -639,7 +655,9 @@ async def delete( raise ValueError(f"Expected a non-empty value for `path_id` but received {path_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/waap/v1/domains/{domain_id}/api-paths/{path_id}", + f"/waap/v1/domains/{domain_id}/api-paths/{path_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-paths/{path_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -677,7 +695,9 @@ async def get( if not path_id: raise ValueError(f"Expected a non-empty value for `path_id` but received {path_id!r}") return await self._get( - f"/waap/v1/domains/{domain_id}/api-paths/{path_id}", + f"/waap/v1/domains/{domain_id}/api-paths/{path_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-paths/{path_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/waap/domains/custom_rules.py b/src/gcore/resources/waap/domains/custom_rules.py index f175a192..adc81b2b 100644 --- a/src/gcore/resources/waap/domains/custom_rules.py +++ b/src/gcore/resources/waap/domains/custom_rules.py @@ -92,7 +92,9 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - f"/waap/v1/domains/{domain_id}/custom-rules", + f"/waap/v1/domains/{domain_id}/custom-rules" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/custom-rules", body=maybe_transform( { "action": action, @@ -155,7 +157,9 @@ def update( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._patch( - f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/custom-rules/{rule_id}", body=maybe_transform( { "action": action, @@ -225,7 +229,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/custom-rules", + f"/waap/v1/domains/{domain_id}/custom-rules" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/custom-rules", page=SyncOffsetPage[WaapCustomRule], options=make_request_options( extra_headers=extra_headers, @@ -278,7 +284,9 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/custom-rules/{rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -315,7 +323,9 @@ def delete_multiple( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - f"/waap/v1/domains/{domain_id}/custom-rules/bulk_delete", + f"/waap/v1/domains/{domain_id}/custom-rules/bulk_delete" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/custom-rules/bulk_delete", body=maybe_transform( {"rule_ids": rule_ids}, custom_rule_delete_multiple_params.CustomRuleDeleteMultipleParams ), @@ -354,7 +364,9 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/custom-rules/{rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -396,7 +408,9 @@ def toggle( raise ValueError(f"Expected a non-empty value for `action` but received {action!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._patch( - f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}/{action}", + f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}/{action}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/custom-rules/{rule_id}/{action}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -466,7 +480,9 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - f"/waap/v1/domains/{domain_id}/custom-rules", + f"/waap/v1/domains/{domain_id}/custom-rules" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/custom-rules", body=await async_maybe_transform( { "action": action, @@ -529,7 +545,9 @@ async def update( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._patch( - f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/custom-rules/{rule_id}", body=await async_maybe_transform( { "action": action, @@ -599,7 +617,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/custom-rules", + f"/waap/v1/domains/{domain_id}/custom-rules" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/custom-rules", page=AsyncOffsetPage[WaapCustomRule], options=make_request_options( extra_headers=extra_headers, @@ -652,7 +672,9 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/custom-rules/{rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -689,7 +711,9 @@ async def delete_multiple( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - f"/waap/v1/domains/{domain_id}/custom-rules/bulk_delete", + f"/waap/v1/domains/{domain_id}/custom-rules/bulk_delete" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/custom-rules/bulk_delete", body=await async_maybe_transform( {"rule_ids": rule_ids}, custom_rule_delete_multiple_params.CustomRuleDeleteMultipleParams ), @@ -728,7 +752,9 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/custom-rules/{rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -770,7 +796,9 @@ async def toggle( raise ValueError(f"Expected a non-empty value for `action` but received {action!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._patch( - f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}/{action}", + f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}/{action}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/custom-rules/{rule_id}/{action}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/waap/domains/domains.py b/src/gcore/resources/waap/domains/domains.py index cf4135cc..6e0e3bac 100644 --- a/src/gcore/resources/waap/domains/domains.py +++ b/src/gcore/resources/waap/domains/domains.py @@ -198,7 +198,9 @@ def update( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._patch( - f"/waap/v1/domains/{domain_id}", + f"/waap/v1/domains/{domain_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}", body=maybe_transform({"status": status}, domain_update_params.DomainUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -248,7 +250,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/waap/v1/domains", + "/waap/v1/domains" if self._client._base_url_overridden else "https://api.gcore.com//waap/v1/domains", page=SyncOffsetPage[WaapSummaryDomain], options=make_request_options( extra_headers=extra_headers, @@ -299,7 +301,9 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/waap/v1/domains/{domain_id}", + f"/waap/v1/domains/{domain_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -332,7 +336,9 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/waap/v1/domains/{domain_id}", + f"/waap/v1/domains/{domain_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -365,7 +371,9 @@ def list_rule_sets( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/waap/v1/domains/{domain_id}/rule-sets", + f"/waap/v1/domains/{domain_id}/rule-sets" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/rule-sets", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -403,7 +411,9 @@ def toggle_policy( if not policy_id: raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}") return self._patch( - f"/waap/v1/domains/{domain_id}/policies/{policy_id}/toggle", + f"/waap/v1/domains/{domain_id}/policies/{policy_id}/toggle" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/policies/{policy_id}/toggle", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -501,7 +511,9 @@ async def update( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._patch( - f"/waap/v1/domains/{domain_id}", + f"/waap/v1/domains/{domain_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}", body=await async_maybe_transform({"status": status}, domain_update_params.DomainUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -551,7 +563,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/waap/v1/domains", + "/waap/v1/domains" if self._client._base_url_overridden else "https://api.gcore.com//waap/v1/domains", page=AsyncOffsetPage[WaapSummaryDomain], options=make_request_options( extra_headers=extra_headers, @@ -602,7 +614,9 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/waap/v1/domains/{domain_id}", + f"/waap/v1/domains/{domain_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -635,7 +649,9 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/waap/v1/domains/{domain_id}", + f"/waap/v1/domains/{domain_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -668,7 +684,9 @@ async def list_rule_sets( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/waap/v1/domains/{domain_id}/rule-sets", + f"/waap/v1/domains/{domain_id}/rule-sets" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/rule-sets", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -706,7 +724,9 @@ async def toggle_policy( if not policy_id: raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}") return await self._patch( - f"/waap/v1/domains/{domain_id}/policies/{policy_id}/toggle", + f"/waap/v1/domains/{domain_id}/policies/{policy_id}/toggle" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/policies/{policy_id}/toggle", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/waap/domains/firewall_rules.py b/src/gcore/resources/waap/domains/firewall_rules.py index b8600359..bf624cf0 100644 --- a/src/gcore/resources/waap/domains/firewall_rules.py +++ b/src/gcore/resources/waap/domains/firewall_rules.py @@ -91,7 +91,9 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - f"/waap/v1/domains/{domain_id}/firewall-rules", + f"/waap/v1/domains/{domain_id}/firewall-rules" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/firewall-rules", body=maybe_transform( { "action": action, @@ -153,7 +155,9 @@ def update( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._patch( - f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/firewall-rules/{rule_id}", body=maybe_transform( { "action": action, @@ -223,7 +227,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/firewall-rules", + f"/waap/v1/domains/{domain_id}/firewall-rules" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/firewall-rules", page=SyncOffsetPage[WaapFirewallRule], options=make_request_options( extra_headers=extra_headers, @@ -276,7 +282,9 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/firewall-rules/{rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -313,7 +321,9 @@ def delete_multiple( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - f"/waap/v1/domains/{domain_id}/firewall-rules/bulk_delete", + f"/waap/v1/domains/{domain_id}/firewall-rules/bulk_delete" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/firewall-rules/bulk_delete", body=maybe_transform( {"rule_ids": rule_ids}, firewall_rule_delete_multiple_params.FirewallRuleDeleteMultipleParams ), @@ -352,7 +362,9 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/firewall-rules/{rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -394,7 +406,9 @@ def toggle( raise ValueError(f"Expected a non-empty value for `action` but received {action!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._patch( - f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}/{action}", + f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}/{action}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/firewall-rules/{rule_id}/{action}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -463,7 +477,9 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - f"/waap/v1/domains/{domain_id}/firewall-rules", + f"/waap/v1/domains/{domain_id}/firewall-rules" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/firewall-rules", body=await async_maybe_transform( { "action": action, @@ -525,7 +541,9 @@ async def update( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._patch( - f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/firewall-rules/{rule_id}", body=await async_maybe_transform( { "action": action, @@ -595,7 +613,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/firewall-rules", + f"/waap/v1/domains/{domain_id}/firewall-rules" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/firewall-rules", page=AsyncOffsetPage[WaapFirewallRule], options=make_request_options( extra_headers=extra_headers, @@ -648,7 +668,9 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/firewall-rules/{rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -685,7 +707,9 @@ async def delete_multiple( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - f"/waap/v1/domains/{domain_id}/firewall-rules/bulk_delete", + f"/waap/v1/domains/{domain_id}/firewall-rules/bulk_delete" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/firewall-rules/bulk_delete", body=await async_maybe_transform( {"rule_ids": rule_ids}, firewall_rule_delete_multiple_params.FirewallRuleDeleteMultipleParams ), @@ -724,7 +748,9 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/firewall-rules/{rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -766,7 +792,9 @@ async def toggle( raise ValueError(f"Expected a non-empty value for `action` but received {action!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._patch( - f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}/{action}", + f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}/{action}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/firewall-rules/{rule_id}/{action}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/waap/domains/insight_silences.py b/src/gcore/resources/waap/domains/insight_silences.py index 577332e9..98372746 100644 --- a/src/gcore/resources/waap/domains/insight_silences.py +++ b/src/gcore/resources/waap/domains/insight_silences.py @@ -93,7 +93,9 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - f"/waap/v1/domains/{domain_id}/insight-silences", + f"/waap/v1/domains/{domain_id}/insight-silences" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insight-silences", body=maybe_transform( { "author": author, @@ -153,7 +155,9 @@ def update( if not silence_id: raise ValueError(f"Expected a non-empty value for `silence_id` but received {silence_id!r}") return self._patch( - f"/waap/v1/domains/{domain_id}/insight-silences/{silence_id}", + f"/waap/v1/domains/{domain_id}/insight-silences/{silence_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insight-silences/{silence_id}", body=maybe_transform( { "author": author, @@ -228,7 +232,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/insight-silences", + f"/waap/v1/domains/{domain_id}/insight-silences" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insight-silences", page=SyncOffsetPage[WaapInsightSilence], options=make_request_options( extra_headers=extra_headers, @@ -283,7 +289,9 @@ def delete( raise ValueError(f"Expected a non-empty value for `silence_id` but received {silence_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/waap/v1/domains/{domain_id}/insight-silences/{silence_id}", + f"/waap/v1/domains/{domain_id}/insight-silences/{silence_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insight-silences/{silence_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -321,7 +329,9 @@ def get( if not silence_id: raise ValueError(f"Expected a non-empty value for `silence_id` but received {silence_id!r}") return self._get( - f"/waap/v1/domains/{domain_id}/insight-silences/{silence_id}", + f"/waap/v1/domains/{domain_id}/insight-silences/{silence_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insight-silences/{silence_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -392,7 +402,9 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - f"/waap/v1/domains/{domain_id}/insight-silences", + f"/waap/v1/domains/{domain_id}/insight-silences" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insight-silences", body=await async_maybe_transform( { "author": author, @@ -452,7 +464,9 @@ async def update( if not silence_id: raise ValueError(f"Expected a non-empty value for `silence_id` but received {silence_id!r}") return await self._patch( - f"/waap/v1/domains/{domain_id}/insight-silences/{silence_id}", + f"/waap/v1/domains/{domain_id}/insight-silences/{silence_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insight-silences/{silence_id}", body=await async_maybe_transform( { "author": author, @@ -527,7 +541,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/insight-silences", + f"/waap/v1/domains/{domain_id}/insight-silences" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insight-silences", page=AsyncOffsetPage[WaapInsightSilence], options=make_request_options( extra_headers=extra_headers, @@ -582,7 +598,9 @@ async def delete( raise ValueError(f"Expected a non-empty value for `silence_id` but received {silence_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/waap/v1/domains/{domain_id}/insight-silences/{silence_id}", + f"/waap/v1/domains/{domain_id}/insight-silences/{silence_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insight-silences/{silence_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -620,7 +638,9 @@ async def get( if not silence_id: raise ValueError(f"Expected a non-empty value for `silence_id` but received {silence_id!r}") return await self._get( - f"/waap/v1/domains/{domain_id}/insight-silences/{silence_id}", + f"/waap/v1/domains/{domain_id}/insight-silences/{silence_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insight-silences/{silence_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/waap/domains/insights.py b/src/gcore/resources/waap/domains/insights.py index 8fb4ab52..7633f059 100644 --- a/src/gcore/resources/waap/domains/insights.py +++ b/src/gcore/resources/waap/domains/insights.py @@ -106,7 +106,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/insights", + f"/waap/v1/domains/{domain_id}/insights" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insights", page=SyncOffsetPage[WaapInsight], options=make_request_options( extra_headers=extra_headers, @@ -158,7 +160,9 @@ def get( if not insight_id: raise ValueError(f"Expected a non-empty value for `insight_id` but received {insight_id!r}") return self._get( - f"/waap/v1/domains/{domain_id}/insights/{insight_id}", + f"/waap/v1/domains/{domain_id}/insights/{insight_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insights/{insight_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -199,7 +203,9 @@ def replace( if not insight_id: raise ValueError(f"Expected a non-empty value for `insight_id` but received {insight_id!r}") return self._put( - f"/waap/v1/domains/{domain_id}/insights/{insight_id}", + f"/waap/v1/domains/{domain_id}/insights/{insight_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insights/{insight_id}", body=maybe_transform({"status": status}, insight_replace_params.InsightReplaceParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -289,7 +295,9 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/insights", + f"/waap/v1/domains/{domain_id}/insights" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insights", page=AsyncOffsetPage[WaapInsight], options=make_request_options( extra_headers=extra_headers, @@ -341,7 +349,9 @@ async def get( if not insight_id: raise ValueError(f"Expected a non-empty value for `insight_id` but received {insight_id!r}") return await self._get( - f"/waap/v1/domains/{domain_id}/insights/{insight_id}", + f"/waap/v1/domains/{domain_id}/insights/{insight_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insights/{insight_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -382,7 +392,9 @@ async def replace( if not insight_id: raise ValueError(f"Expected a non-empty value for `insight_id` but received {insight_id!r}") return await self._put( - f"/waap/v1/domains/{domain_id}/insights/{insight_id}", + f"/waap/v1/domains/{domain_id}/insights/{insight_id}" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insights/{insight_id}", body=await async_maybe_transform({"status": status}, insight_replace_params.InsightReplaceParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout diff --git a/src/gcore/resources/waap/domains/settings.py b/src/gcore/resources/waap/domains/settings.py index fc9cafbf..17c719c1 100644 --- a/src/gcore/resources/waap/domains/settings.py +++ b/src/gcore/resources/waap/domains/settings.py @@ -74,7 +74,9 @@ def update( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._patch( - f"/waap/v1/domains/{domain_id}/settings", + f"/waap/v1/domains/{domain_id}/settings" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/settings", body=maybe_transform( { "api": api, @@ -114,7 +116,9 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/waap/v1/domains/{domain_id}/settings", + f"/waap/v1/domains/{domain_id}/settings" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/settings", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -175,7 +179,9 @@ async def update( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._patch( - f"/waap/v1/domains/{domain_id}/settings", + f"/waap/v1/domains/{domain_id}/settings" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/settings", body=await async_maybe_transform( { "api": api, @@ -215,7 +221,9 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/waap/v1/domains/{domain_id}/settings", + f"/waap/v1/domains/{domain_id}/settings" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/settings", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/waap/domains/statistics.py b/src/gcore/resources/waap/domains/statistics.py index f23b048b..517d55f6 100644 --- a/src/gcore/resources/waap/domains/statistics.py +++ b/src/gcore/resources/waap/domains/statistics.py @@ -98,7 +98,9 @@ def get_ddos_attacks( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/ddos-attacks", + f"/waap/v1/domains/{domain_id}/ddos-attacks" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/ddos-attacks", page=SyncOffsetPage[WaapDDOSAttack], options=make_request_options( extra_headers=extra_headers, @@ -161,7 +163,9 @@ def get_ddos_info( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/ddos-info", + f"/waap/v1/domains/{domain_id}/ddos-info" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/ddos-info", page=SyncOffsetPage[WaapDDOSInfo], options=make_request_options( extra_headers=extra_headers, @@ -227,7 +231,9 @@ def get_events_aggregated( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/waap/v1/domains/{domain_id}/stats", + f"/waap/v1/domains/{domain_id}/stats" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/stats", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -280,7 +286,9 @@ def get_request_details( if not request_id: raise ValueError(f"Expected a non-empty value for `request_id` but received {request_id!r}") return self._get( - f"/waap/v1/domains/{domain_id}/requests/{request_id}/details", + f"/waap/v1/domains/{domain_id}/requests/{request_id}/details" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/requests/{request_id}/details", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -374,7 +382,9 @@ def get_requests_series( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/requests", + f"/waap/v1/domains/{domain_id}/requests" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/requests", page=SyncOffsetPage[WaapRequestSummary], options=make_request_options( extra_headers=extra_headers, @@ -440,7 +450,9 @@ def get_traffic_series( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/waap/v1/domains/{domain_id}/traffic", + f"/waap/v1/domains/{domain_id}/traffic" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/traffic", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -520,7 +532,9 @@ def get_ddos_attacks( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/ddos-attacks", + f"/waap/v1/domains/{domain_id}/ddos-attacks" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/ddos-attacks", page=AsyncOffsetPage[WaapDDOSAttack], options=make_request_options( extra_headers=extra_headers, @@ -583,7 +597,9 @@ def get_ddos_info( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/ddos-info", + f"/waap/v1/domains/{domain_id}/ddos-info" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/ddos-info", page=AsyncOffsetPage[WaapDDOSInfo], options=make_request_options( extra_headers=extra_headers, @@ -649,7 +665,9 @@ async def get_events_aggregated( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/waap/v1/domains/{domain_id}/stats", + f"/waap/v1/domains/{domain_id}/stats" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/stats", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -702,7 +720,9 @@ async def get_request_details( if not request_id: raise ValueError(f"Expected a non-empty value for `request_id` but received {request_id!r}") return await self._get( - f"/waap/v1/domains/{domain_id}/requests/{request_id}/details", + f"/waap/v1/domains/{domain_id}/requests/{request_id}/details" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/requests/{request_id}/details", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -796,7 +816,9 @@ def get_requests_series( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/requests", + f"/waap/v1/domains/{domain_id}/requests" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/requests", page=AsyncOffsetPage[WaapRequestSummary], options=make_request_options( extra_headers=extra_headers, @@ -862,7 +884,9 @@ async def get_traffic_series( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/waap/v1/domains/{domain_id}/traffic", + f"/waap/v1/domains/{domain_id}/traffic" + if self._client._base_url_overridden + else f"https://api.gcore.com//waap/v1/domains/{domain_id}/traffic", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/waap/insights.py b/src/gcore/resources/waap/insights.py index e056e67a..0634ffef 100644 --- a/src/gcore/resources/waap/insights.py +++ b/src/gcore/resources/waap/insights.py @@ -88,7 +88,9 @@ def list_types( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/waap/v1/security-insights/types", + "/waap/v1/security-insights/types" + if self._client._base_url_overridden + else "https://api.gcore.com//waap/v1/security-insights/types", page=SyncOffsetPage[WaapInsightType], options=make_request_options( extra_headers=extra_headers, @@ -174,7 +176,9 @@ def list_types( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/waap/v1/security-insights/types", + "/waap/v1/security-insights/types" + if self._client._base_url_overridden + else "https://api.gcore.com//waap/v1/security-insights/types", page=AsyncOffsetPage[WaapInsightType], options=make_request_options( extra_headers=extra_headers, diff --git a/src/gcore/resources/waap/ip_info/ip_info.py b/src/gcore/resources/waap/ip_info/ip_info.py index e721bf7d..e1a6fa7c 100644 --- a/src/gcore/resources/waap/ip_info/ip_info.py +++ b/src/gcore/resources/waap/ip_info/ip_info.py @@ -95,7 +95,9 @@ def get_attack_time_series( 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, @@ -142,7 +144,9 @@ def get_blocked_requests( 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, @@ -189,7 +193,9 @@ def get_ddos_attack_series( 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, @@ -229,7 +235,9 @@ def get_ip_info( 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, @@ -274,7 +282,9 @@ def get_top_urls( 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, @@ -323,7 +333,9 @@ def get_top_user_agents( 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, @@ -372,7 +384,9 @@ def get_top_user_sessions( 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, @@ -415,7 +429,9 @@ def list_attacked_countries( 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, @@ -479,7 +495,9 @@ async def get_attack_time_series( 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, @@ -526,7 +544,9 @@ async def get_blocked_requests( 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, @@ -573,7 +593,9 @@ async def get_ddos_attack_series( 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, @@ -613,7 +635,9 @@ async def get_ip_info( 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, @@ -658,7 +682,9 @@ async def get_top_urls( 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, @@ -707,7 +733,9 @@ async def get_top_user_agents( 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, @@ -756,7 +784,9 @@ async def get_top_user_sessions( 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, @@ -799,7 +829,9 @@ async def list_attacked_countries( 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, diff --git a/src/gcore/resources/waap/ip_info/metrics.py b/src/gcore/resources/waap/ip_info/metrics.py index c70d3faa..32f17c80 100644 --- a/src/gcore/resources/waap/ip_info/metrics.py +++ b/src/gcore/resources/waap/ip_info/metrics.py @@ -77,7 +77,9 @@ def list( 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, @@ -149,7 +151,9 @@ async def list( 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, diff --git a/src/gcore/resources/waap/organizations.py b/src/gcore/resources/waap/organizations.py index f36dcb35..ffe33962 100644 --- a/src/gcore/resources/waap/organizations.py +++ b/src/gcore/resources/waap/organizations.py @@ -82,7 +82,9 @@ def list( 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, @@ -160,7 +162,9 @@ def list( 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, diff --git a/src/gcore/resources/waap/statistics.py b/src/gcore/resources/waap/statistics.py index f8258bab..5f64899e 100644 --- a/src/gcore/resources/waap/statistics.py +++ b/src/gcore/resources/waap/statistics.py @@ -87,7 +87,9 @@ def get_usage_series( 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, @@ -169,7 +171,9 @@ async def get_usage_series( 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, diff --git a/src/gcore/resources/waap/tags.py b/src/gcore/resources/waap/tags.py index df171560..f2ced3d7 100644 --- a/src/gcore/resources/waap/tags.py +++ b/src/gcore/resources/waap/tags.py @@ -88,7 +88,7 @@ def list( 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, @@ -174,7 +174,7 @@ def list( 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, diff --git a/src/gcore/resources/waap/waap.py b/src/gcore/resources/waap/waap.py index 3d68c41f..4f621d4e 100644 --- a/src/gcore/resources/waap/waap.py +++ b/src/gcore/resources/waap/waap.py @@ -147,7 +147,7 @@ def get_account_overview( ) -> 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 ), @@ -219,7 +219,7 @@ async def get_account_overview( ) -> 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 ), From 09db4dde07cbec7bb8e94348c6ef78578c3022d3 Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Fri, 12 Sep 2025 14:24:29 +0000 Subject: [PATCH 08/16] feat(api): aggregated API specs update --- .stats.yml | 4 +- src/gcore/_client.py | 10 +- src/gcore/resources/cloud/audit_logs.py | 8 +- .../resources/cloud/baremetal/flavors.py | 8 +- src/gcore/resources/cloud/baremetal/images.py | 8 +- .../resources/cloud/baremetal/servers.py | 24 +-- .../resources/cloud/billing_reservations.py | 16 +- src/gcore/resources/cloud/cost_reports.py | 24 +-- .../cloud/file_shares/access_rules.py | 24 +-- .../cloud/file_shares/file_shares.py | 48 ++--- src/gcore/resources/cloud/floating_ips.py | 48 ++--- .../cloud/gpu_baremetal_clusters/flavors.py | 8 +- .../gpu_baremetal_clusters.py | 64 ++---- .../cloud/gpu_baremetal_clusters/images.py | 32 +-- .../gpu_baremetal_clusters/interfaces.py | 8 +- .../cloud/gpu_baremetal_clusters/servers.py | 56 ++---- .../resources/cloud/inference/api_keys.py | 40 +--- .../inference/applications/deployments.py | 40 +--- .../cloud/inference/applications/templates.py | 16 +- .../inference/deployments/deployments.py | 64 ++---- .../cloud/inference/deployments/logs.py | 8 +- .../resources/cloud/inference/flavors.py | 16 +- .../resources/cloud/inference/inference.py | 8 +- .../cloud/inference/registry_credentials.py | 40 +--- .../resources/cloud/inference/secrets.py | 40 +--- .../resources/cloud/instances/flavors.py | 8 +- src/gcore/resources/cloud/instances/images.py | 48 ++--- .../resources/cloud/instances/instances.py | 112 +++-------- .../resources/cloud/instances/interfaces.py | 24 +-- .../resources/cloud/instances/metrics.py | 8 +- src/gcore/resources/cloud/ip_ranges.py | 8 +- .../resources/cloud/k8s/clusters/clusters.py | 72 ++----- .../resources/cloud/k8s/clusters/nodes.py | 16 +- .../cloud/k8s/clusters/pools/nodes.py | 16 +- .../cloud/k8s/clusters/pools/pools.py | 48 ++--- src/gcore/resources/cloud/k8s/flavors.py | 8 +- src/gcore/resources/cloud/k8s/k8s.py | 8 +- .../resources/cloud/load_balancers/flavors.py | 8 +- .../load_balancers/l7_policies/l7_policies.py | 40 +--- .../cloud/load_balancers/l7_policies/rules.py | 40 +--- .../cloud/load_balancers/listeners.py | 40 +--- .../cloud/load_balancers/load_balancers.py | 56 ++---- .../resources/cloud/load_balancers/metrics.py | 8 +- .../load_balancers/pools/health_monitors.py | 16 +- .../cloud/load_balancers/pools/members.py | 16 +- .../cloud/load_balancers/pools/pools.py | 40 +--- .../cloud/load_balancers/statuses.py | 16 +- .../resources/cloud/networks/networks.py | 40 +--- src/gcore/resources/cloud/networks/routers.py | 56 ++---- src/gcore/resources/cloud/networks/subnets.py | 40 +--- src/gcore/resources/cloud/placement_groups.py | 32 +-- src/gcore/resources/cloud/projects.py | 32 +-- src/gcore/resources/cloud/quotas/quotas.py | 24 +-- src/gcore/resources/cloud/quotas/requests.py | 32 +-- src/gcore/resources/cloud/regions.py | 12 +- .../resources/cloud/registries/artifacts.py | 16 +- .../resources/cloud/registries/registries.py | 40 +--- .../cloud/registries/repositories.py | 16 +- src/gcore/resources/cloud/registries/tags.py | 8 +- src/gcore/resources/cloud/registries/users.py | 48 ++--- .../reserved_fixed_ips/reserved_fixed_ips.py | 32 +-- .../resources/cloud/reserved_fixed_ips/vip.py | 40 +--- src/gcore/resources/cloud/secrets.py | 32 +-- .../resources/cloud/security_groups/rules.py | 24 +-- .../cloud/security_groups/security_groups.py | 56 ++---- src/gcore/resources/cloud/ssh_keys.py | 40 +--- src/gcore/resources/cloud/tasks.py | 28 +-- src/gcore/resources/cloud/usage_reports.py | 8 +- .../resources/cloud/users/role_assignments.py | 32 +-- src/gcore/resources/cloud/volumes.py | 80 ++------ src/gcore/resources/dns/dns.py | 12 +- src/gcore/resources/dns/locations.py | 28 +-- src/gcore/resources/dns/metrics.py | 8 +- src/gcore/resources/dns/pickers/pickers.py | 4 +- src/gcore/resources/dns/pickers/presets.py | 8 +- src/gcore/resources/dns/zones/dnssec.py | 16 +- src/gcore/resources/dns/zones/rrsets.py | 48 ++--- src/gcore/resources/dns/zones/zones.py | 80 +++----- src/gcore/resources/fastedge/apps/apps.py | 40 ++-- src/gcore/resources/fastedge/apps/logs.py | 8 +- src/gcore/resources/fastedge/binaries.py | 32 +-- src/gcore/resources/fastedge/fastedge.py | 4 +- src/gcore/resources/fastedge/kv_stores.py | 32 +-- src/gcore/resources/fastedge/secrets.py | 48 ++--- src/gcore/resources/fastedge/statistics.py | 16 +- src/gcore/resources/fastedge/templates.py | 40 +--- src/gcore/resources/iam/api_tokens.py | 32 +-- src/gcore/resources/iam/iam.py | 4 +- src/gcore/resources/iam/users.py | 36 +--- src/gcore/resources/security/bgp_announces.py | 16 +- src/gcore/resources/security/events.py | 8 +- .../resources/security/profile_templates.py | 8 +- src/gcore/resources/security/profiles.py | 48 ++--- .../resources/storage/buckets/buckets.py | 24 +-- src/gcore/resources/storage/buckets/cors.py | 16 +- .../resources/storage/buckets/lifecycle.py | 16 +- src/gcore/resources/storage/buckets/policy.py | 24 +-- src/gcore/resources/storage/credentials.py | 8 +- src/gcore/resources/storage/locations.py | 8 +- src/gcore/resources/storage/statistics.py | 16 +- src/gcore/resources/storage/storage.py | 64 ++---- src/gcore/resources/streaming/ai_tasks.py | 28 +-- src/gcore/resources/streaming/broadcasts.py | 48 ++--- src/gcore/resources/streaming/directories.py | 40 +--- src/gcore/resources/streaming/players.py | 40 ++-- src/gcore/resources/streaming/playlists.py | 48 ++--- src/gcore/resources/streaming/quality_sets.py | 16 +- src/gcore/resources/streaming/restreams.py | 40 +--- src/gcore/resources/streaming/statistics.py | 184 +++++------------- .../resources/streaming/streams/overlays.py | 48 ++--- .../resources/streaming/streams/streams.py | 72 ++----- .../resources/streaming/videos/subtitles.py | 40 +--- .../resources/streaming/videos/videos.py | 56 ++---- src/gcore/resources/waap/advanced_rules.py | 8 +- src/gcore/resources/waap/custom_page_sets.py | 48 ++--- .../resources/waap/domains/advanced_rules.py | 48 ++--- .../resources/waap/domains/api_discovery.py | 48 ++--- .../resources/waap/domains/api_path_groups.py | 8 +- src/gcore/resources/waap/domains/api_paths.py | 40 +--- .../resources/waap/domains/custom_rules.py | 56 ++---- src/gcore/resources/waap/domains/domains.py | 44 ++--- .../resources/waap/domains/firewall_rules.py | 56 ++---- .../waap/domains/insight_silences.py | 40 +--- src/gcore/resources/waap/domains/insights.py | 24 +-- src/gcore/resources/waap/domains/settings.py | 16 +- .../resources/waap/domains/statistics.py | 48 ++--- src/gcore/resources/waap/insights.py | 8 +- src/gcore/resources/waap/ip_info/ip_info.py | 64 ++---- src/gcore/resources/waap/ip_info/metrics.py | 8 +- src/gcore/resources/waap/organizations.py | 8 +- src/gcore/resources/waap/statistics.py | 8 +- src/gcore/resources/waap/tags.py | 4 +- src/gcore/resources/waap/waap.py | 4 +- 133 files changed, 1050 insertions(+), 3036 deletions(-) diff --git a/.stats.yml b/.stats.yml index 623270eb..a8e94942 100644 --- a/.stats.yml +++ b/.stats.yml @@ -1,4 +1,4 @@ configured_endpoints: 523 -openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/gcore%2Fgcore-5d5a213a2cafe76bf32aee1ad65af4e90d3d00b4d6fc90672aaf5e8f66f3f132.yml -openapi_spec_hash: 92b967214f53666d69d5cc9df277376e +openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/gcore%2Fgcore-41a0bfcc37b5bb42a72fc8a83fd2206024930816e6ae11496b66be03436db20c.yml +openapi_spec_hash: 6d1a8bbafd395b9cb8caa31890a4b0bc config_hash: 28b1157595821f9f0eb3e9f3ea690703 diff --git a/src/gcore/_client.py b/src/gcore/_client.py index 94bb9d2b..fb66fd59 100644 --- a/src/gcore/_client.py +++ b/src/gcore/_client.py @@ -113,7 +113,6 @@ def __init__( 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" @@ -198,7 +197,7 @@ def copy( 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, @@ -211,8 +210,6 @@ def copy( 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(...) @@ -343,7 +340,6 @@ def __init__( 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" @@ -428,7 +424,7 @@ def copy( 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, @@ -441,8 +437,6 @@ def copy( 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(...) diff --git a/src/gcore/resources/cloud/audit_logs.py b/src/gcore/resources/cloud/audit_logs.py index 1f4ae40e..1dad329f 100644 --- a/src/gcore/resources/cloud/audit_logs.py +++ b/src/gcore/resources/cloud/audit_logs.py @@ -206,9 +206,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v1/user_actions" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v1/user_actions", + "/cloud/v1/user_actions", page=SyncOffsetPage[AuditLogEntry], options=make_request_options( extra_headers=extra_headers, @@ -417,9 +415,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v1/user_actions" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v1/user_actions", + "/cloud/v1/user_actions", page=AsyncOffsetPage[AuditLogEntry], options=make_request_options( extra_headers=extra_headers, diff --git a/src/gcore/resources/cloud/baremetal/flavors.py b/src/gcore/resources/cloud/baremetal/flavors.py index 91474de4..1645b30b 100644 --- a/src/gcore/resources/cloud/baremetal/flavors.py +++ b/src/gcore/resources/cloud/baremetal/flavors.py @@ -93,9 +93,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/bmflavors/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/bmflavors/{project_id}/{region_id}", + f"/cloud/v1/bmflavors/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -189,9 +187,7 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/bmflavors/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/bmflavors/{project_id}/{region_id}", + f"/cloud/v1/bmflavors/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/cloud/baremetal/images.py b/src/gcore/resources/cloud/baremetal/images.py index ecc0adc3..a6a22954 100644 --- a/src/gcore/resources/cloud/baremetal/images.py +++ b/src/gcore/resources/cloud/baremetal/images.py @@ -90,9 +90,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/bmimages/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/bmimages/{project_id}/{region_id}", + f"/cloud/v1/bmimages/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -180,9 +178,7 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/bmimages/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/bmimages/{project_id}/{region_id}", + f"/cloud/v1/bmimages/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/cloud/baremetal/servers.py b/src/gcore/resources/cloud/baremetal/servers.py index 83156790..d9120d43 100644 --- a/src/gcore/resources/cloud/baremetal/servers.py +++ b/src/gcore/resources/cloud/baremetal/servers.py @@ -156,9 +156,7 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/bminstances/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/bminstances/{project_id}/{region_id}", + f"/cloud/v1/bminstances/{project_id}/{region_id}", body=maybe_transform( { "flavor": flavor, @@ -296,9 +294,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/bminstances/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/bminstances/{project_id}/{region_id}", + f"/cloud/v1/bminstances/{project_id}/{region_id}", page=SyncOffsetPage[BaremetalServer], options=make_request_options( extra_headers=extra_headers, @@ -381,9 +377,7 @@ def rebuild( if not server_id: raise ValueError(f"Expected a non-empty value for `server_id` but received {server_id!r}") return self._post( - f"/cloud/v1/bminstances/{project_id}/{region_id}/{server_id}/rebuild" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/bminstances/{project_id}/{region_id}/{server_id}/rebuild", + f"/cloud/v1/bminstances/{project_id}/{region_id}/{server_id}/rebuild", body=maybe_transform( { "image_id": image_id, @@ -644,9 +638,7 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/bminstances/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/bminstances/{project_id}/{region_id}", + f"/cloud/v1/bminstances/{project_id}/{region_id}", body=await async_maybe_transform( { "flavor": flavor, @@ -784,9 +776,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/bminstances/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/bminstances/{project_id}/{region_id}", + f"/cloud/v1/bminstances/{project_id}/{region_id}", page=AsyncOffsetPage[BaremetalServer], options=make_request_options( extra_headers=extra_headers, @@ -869,9 +859,7 @@ async def rebuild( if not server_id: raise ValueError(f"Expected a non-empty value for `server_id` but received {server_id!r}") return await self._post( - f"/cloud/v1/bminstances/{project_id}/{region_id}/{server_id}/rebuild" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/bminstances/{project_id}/{region_id}/{server_id}/rebuild", + f"/cloud/v1/bminstances/{project_id}/{region_id}/{server_id}/rebuild", body=await async_maybe_transform( { "image_id": image_id, diff --git a/src/gcore/resources/cloud/billing_reservations.py b/src/gcore/resources/cloud/billing_reservations.py index ae49d667..0d9df747 100644 --- a/src/gcore/resources/cloud/billing_reservations.py +++ b/src/gcore/resources/cloud/billing_reservations.py @@ -120,9 +120,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v1/reservations" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v1/reservations", + "/cloud/v1/reservations", page=SyncOffsetPage[BillingReservation], options=make_request_options( extra_headers=extra_headers, @@ -176,9 +174,7 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/cloud/v1/reservations/{reservation_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/reservations/{reservation_id}", + f"/cloud/v1/reservations/{reservation_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -280,9 +276,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v1/reservations" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v1/reservations", + "/cloud/v1/reservations", page=AsyncOffsetPage[BillingReservation], options=make_request_options( extra_headers=extra_headers, @@ -336,9 +330,7 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/cloud/v1/reservations/{reservation_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/reservations/{reservation_id}", + f"/cloud/v1/reservations/{reservation_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/cost_reports.py b/src/gcore/resources/cloud/cost_reports.py index 910b8fa7..36075dd6 100644 --- a/src/gcore/resources/cloud/cost_reports.py +++ b/src/gcore/resources/cloud/cost_reports.py @@ -146,9 +146,7 @@ def get_aggregated( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/cloud/v1/cost_report/totals" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v1/cost_report/totals", + "/cloud/v1/cost_report/totals", body=maybe_transform( { "time_from": time_from, @@ -257,9 +255,7 @@ def get_aggregated_monthly( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/cloud/v1/reservation_cost_report/totals" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v1/reservation_cost_report/totals", + "/cloud/v1/reservation_cost_report/totals", body=maybe_transform( { "regions": regions, @@ -385,9 +381,7 @@ def get_detailed( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/cloud/v1/cost_report/resources" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v1/cost_report/resources", + "/cloud/v1/cost_report/resources", body=maybe_transform( { "time_from": time_from, @@ -528,9 +522,7 @@ async def get_aggregated( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/cloud/v1/cost_report/totals" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v1/cost_report/totals", + "/cloud/v1/cost_report/totals", body=await async_maybe_transform( { "time_from": time_from, @@ -639,9 +631,7 @@ async def get_aggregated_monthly( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/cloud/v1/reservation_cost_report/totals" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v1/reservation_cost_report/totals", + "/cloud/v1/reservation_cost_report/totals", body=await async_maybe_transform( { "regions": regions, @@ -767,9 +757,7 @@ async def get_detailed( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/cloud/v1/cost_report/resources" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v1/cost_report/resources", + "/cloud/v1/cost_report/resources", body=await async_maybe_transform( { "time_from": time_from, diff --git a/src/gcore/resources/cloud/file_shares/access_rules.py b/src/gcore/resources/cloud/file_shares/access_rules.py index c7c23710..34cc65ee 100644 --- a/src/gcore/resources/cloud/file_shares/access_rules.py +++ b/src/gcore/resources/cloud/file_shares/access_rules.py @@ -88,9 +88,7 @@ def create( if not file_share_id: raise ValueError(f"Expected a non-empty value for `file_share_id` but received {file_share_id!r}") return self._post( - f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule", + f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule", body=maybe_transform( { "access_mode": access_mode, @@ -142,9 +140,7 @@ def list( if not file_share_id: raise ValueError(f"Expected a non-empty value for `file_share_id` but received {file_share_id!r}") return self._get( - f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule", + f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -195,9 +191,7 @@ def delete( raise ValueError(f"Expected a non-empty value for `access_rule_id` but received {access_rule_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule/{access_rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule/{access_rule_id}", + f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule/{access_rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -269,9 +263,7 @@ async def create( if not file_share_id: raise ValueError(f"Expected a non-empty value for `file_share_id` but received {file_share_id!r}") return await self._post( - f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule", + f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule", body=await async_maybe_transform( { "access_mode": access_mode, @@ -323,9 +315,7 @@ async def list( if not file_share_id: raise ValueError(f"Expected a non-empty value for `file_share_id` but received {file_share_id!r}") return await self._get( - f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule", + f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -376,9 +366,7 @@ async def delete( raise ValueError(f"Expected a non-empty value for `access_rule_id` but received {access_rule_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule/{access_rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule/{access_rule_id}", + f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/access_rule/{access_rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/file_shares/file_shares.py b/src/gcore/resources/cloud/file_shares/file_shares.py index b35b9ea8..99a806d5 100644 --- a/src/gcore/resources/cloud/file_shares/file_shares.py +++ b/src/gcore/resources/cloud/file_shares/file_shares.py @@ -206,9 +206,7 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/file_shares/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}", + f"/cloud/v1/file_shares/{project_id}/{region_id}", body=maybe_transform( { "name": name, @@ -291,9 +289,7 @@ def update( if not file_share_id: raise ValueError(f"Expected a non-empty value for `file_share_id` but received {file_share_id!r}") return self._patch( - f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}", + f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}", body=maybe_transform( { "name": name, @@ -353,9 +349,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/file_shares/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}", + f"/cloud/v1/file_shares/{project_id}/{region_id}", page=SyncOffsetPage[FileShare], options=make_request_options( extra_headers=extra_headers, @@ -413,9 +407,7 @@ def delete( if not file_share_id: raise ValueError(f"Expected a non-empty value for `file_share_id` but received {file_share_id!r}") return self._delete( - f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}", + f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -460,9 +452,7 @@ def get( if not file_share_id: raise ValueError(f"Expected a non-empty value for `file_share_id` but received {file_share_id!r}") return self._get( - f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}", + f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -510,9 +500,7 @@ def resize( if not file_share_id: raise ValueError(f"Expected a non-empty value for `file_share_id` but received {file_share_id!r}") return self._post( - f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/extend" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/extend", + f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/extend", body=maybe_transform({"size": size}, file_share_resize_params.FileShareResizeParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -687,9 +675,7 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/file_shares/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}", + f"/cloud/v1/file_shares/{project_id}/{region_id}", body=await async_maybe_transform( { "name": name, @@ -772,9 +758,7 @@ async def update( if not file_share_id: raise ValueError(f"Expected a non-empty value for `file_share_id` but received {file_share_id!r}") return await self._patch( - f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}", + f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}", body=await async_maybe_transform( { "name": name, @@ -834,9 +818,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/file_shares/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}", + f"/cloud/v1/file_shares/{project_id}/{region_id}", page=AsyncOffsetPage[FileShare], options=make_request_options( extra_headers=extra_headers, @@ -894,9 +876,7 @@ async def delete( if not file_share_id: raise ValueError(f"Expected a non-empty value for `file_share_id` but received {file_share_id!r}") return await self._delete( - f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}", + f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -941,9 +921,7 @@ async def get( if not file_share_id: raise ValueError(f"Expected a non-empty value for `file_share_id` but received {file_share_id!r}") return await self._get( - f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}", + f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -991,9 +969,7 @@ async def resize( if not file_share_id: raise ValueError(f"Expected a non-empty value for `file_share_id` but received {file_share_id!r}") return await self._post( - f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/extend" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/extend", + f"/cloud/v1/file_shares/{project_id}/{region_id}/{file_share_id}/extend", body=await async_maybe_transform({"size": size}, file_share_resize_params.FileShareResizeParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout diff --git a/src/gcore/resources/cloud/floating_ips.py b/src/gcore/resources/cloud/floating_ips.py index bcf2f518..fe0fb27b 100644 --- a/src/gcore/resources/cloud/floating_ips.py +++ b/src/gcore/resources/cloud/floating_ips.py @@ -94,9 +94,7 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/floatingips/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/floatingips/{project_id}/{region_id}", + f"/cloud/v1/floatingips/{project_id}/{region_id}", body=maybe_transform( { "fixed_ip_address": fixed_ip_address, @@ -157,9 +155,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/floatingips/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/floatingips/{project_id}/{region_id}", + f"/cloud/v1/floatingips/{project_id}/{region_id}", page=SyncOffsetPage[FloatingIPDetailed], options=make_request_options( extra_headers=extra_headers, @@ -217,9 +213,7 @@ def delete( if not floating_ip_id: raise ValueError(f"Expected a non-empty value for `floating_ip_id` but received {floating_ip_id!r}") return self._delete( - f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}", + f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -264,9 +258,7 @@ def assign( if not floating_ip_id: raise ValueError(f"Expected a non-empty value for `floating_ip_id` but received {floating_ip_id!r}") return self._post( - f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}/assign" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}/assign", + f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}/assign", body=maybe_transform( { "port_id": port_id, @@ -318,9 +310,7 @@ def get( if not floating_ip_id: raise ValueError(f"Expected a non-empty value for `floating_ip_id` but received {floating_ip_id!r}") return self._get( - f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}", + f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -359,9 +349,7 @@ def unassign( if not floating_ip_id: raise ValueError(f"Expected a non-empty value for `floating_ip_id` but received {floating_ip_id!r}") return self._post( - f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}/unassign" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}/unassign", + f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}/unassign", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -521,9 +509,7 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/floatingips/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/floatingips/{project_id}/{region_id}", + f"/cloud/v1/floatingips/{project_id}/{region_id}", body=await async_maybe_transform( { "fixed_ip_address": fixed_ip_address, @@ -584,9 +570,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/floatingips/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/floatingips/{project_id}/{region_id}", + f"/cloud/v1/floatingips/{project_id}/{region_id}", page=AsyncOffsetPage[FloatingIPDetailed], options=make_request_options( extra_headers=extra_headers, @@ -644,9 +628,7 @@ async def delete( if not floating_ip_id: raise ValueError(f"Expected a non-empty value for `floating_ip_id` but received {floating_ip_id!r}") return await self._delete( - f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}", + f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -691,9 +673,7 @@ async def assign( if not floating_ip_id: raise ValueError(f"Expected a non-empty value for `floating_ip_id` but received {floating_ip_id!r}") return await self._post( - f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}/assign" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}/assign", + f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}/assign", body=await async_maybe_transform( { "port_id": port_id, @@ -745,9 +725,7 @@ async def get( if not floating_ip_id: raise ValueError(f"Expected a non-empty value for `floating_ip_id` but received {floating_ip_id!r}") return await self._get( - f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}", + f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -786,9 +764,7 @@ async def unassign( if not floating_ip_id: raise ValueError(f"Expected a non-empty value for `floating_ip_id` but received {floating_ip_id!r}") return await self._post( - f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}/unassign" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}/unassign", + f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}/unassign", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/gpu_baremetal_clusters/flavors.py b/src/gcore/resources/cloud/gpu_baremetal_clusters/flavors.py index 6d594b3b..2c4563b5 100644 --- a/src/gcore/resources/cloud/gpu_baremetal_clusters/flavors.py +++ b/src/gcore/resources/cloud/gpu_baremetal_clusters/flavors.py @@ -80,9 +80,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/flavors" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/flavors", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/flavors", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -159,9 +157,7 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/flavors" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/flavors", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/flavors", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/cloud/gpu_baremetal_clusters/gpu_baremetal_clusters.py b/src/gcore/resources/cloud/gpu_baremetal_clusters/gpu_baremetal_clusters.py index 91ecdaba..6a040f84 100644 --- a/src/gcore/resources/cloud/gpu_baremetal_clusters/gpu_baremetal_clusters.py +++ b/src/gcore/resources/cloud/gpu_baremetal_clusters/gpu_baremetal_clusters.py @@ -156,9 +156,7 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters", body=maybe_transform( { "flavor": flavor, @@ -222,9 +220,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters", page=SyncOffsetPage[GPUBaremetalCluster], options=make_request_options( extra_headers=extra_headers, @@ -295,9 +291,7 @@ def delete( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return self._delete( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -354,9 +348,7 @@ def get( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return self._get( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -395,9 +387,7 @@ def powercycle_all_servers( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return self._post( - f"/cloud/v2/ai/clusters/{project_id}/{region_id}/{cluster_id}/powercycle" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/ai/clusters/{project_id}/{region_id}/{cluster_id}/powercycle", + f"/cloud/v2/ai/clusters/{project_id}/{region_id}/{cluster_id}/powercycle", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -436,9 +426,7 @@ def reboot_all_servers( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return self._post( - f"/cloud/v2/ai/clusters/{project_id}/{region_id}/{cluster_id}/reboot" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/ai/clusters/{project_id}/{region_id}/{cluster_id}/reboot", + f"/cloud/v2/ai/clusters/{project_id}/{region_id}/{cluster_id}/reboot", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -490,9 +478,7 @@ def rebuild( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return self._post( - f"/cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/rebuild" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/rebuild", + f"/cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/rebuild", body=maybe_transform( { "nodes": nodes, @@ -544,9 +530,7 @@ def resize( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return self._post( - f"/cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/resize" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/resize", + f"/cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/resize", body=maybe_transform( {"instances_count": instances_count}, gpu_baremetal_cluster_resize_params.GPUBaremetalClusterResizeParams, @@ -805,9 +789,7 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters", body=await async_maybe_transform( { "flavor": flavor, @@ -871,9 +853,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters", page=AsyncOffsetPage[GPUBaremetalCluster], options=make_request_options( extra_headers=extra_headers, @@ -944,9 +924,7 @@ async def delete( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return await self._delete( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1003,9 +981,7 @@ async def get( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return await self._get( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1044,9 +1020,7 @@ async def powercycle_all_servers( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return await self._post( - f"/cloud/v2/ai/clusters/{project_id}/{region_id}/{cluster_id}/powercycle" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/ai/clusters/{project_id}/{region_id}/{cluster_id}/powercycle", + f"/cloud/v2/ai/clusters/{project_id}/{region_id}/{cluster_id}/powercycle", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1085,9 +1059,7 @@ async def reboot_all_servers( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return await self._post( - f"/cloud/v2/ai/clusters/{project_id}/{region_id}/{cluster_id}/reboot" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/ai/clusters/{project_id}/{region_id}/{cluster_id}/reboot", + f"/cloud/v2/ai/clusters/{project_id}/{region_id}/{cluster_id}/reboot", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1139,9 +1111,7 @@ async def rebuild( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return await self._post( - f"/cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/rebuild" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/rebuild", + f"/cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/rebuild", body=await async_maybe_transform( { "nodes": nodes, @@ -1193,9 +1163,7 @@ async def resize( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return await self._post( - f"/cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/resize" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/resize", + f"/cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/resize", body=await async_maybe_transform( {"instances_count": instances_count}, gpu_baremetal_cluster_resize_params.GPUBaremetalClusterResizeParams, diff --git a/src/gcore/resources/cloud/gpu_baremetal_clusters/images.py b/src/gcore/resources/cloud/gpu_baremetal_clusters/images.py index 60a4b6e2..4d1aa992 100644 --- a/src/gcore/resources/cloud/gpu_baremetal_clusters/images.py +++ b/src/gcore/resources/cloud/gpu_baremetal_clusters/images.py @@ -79,9 +79,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/images", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -126,9 +124,7 @@ def delete( if not image_id: raise ValueError(f"Expected a non-empty value for `image_id` but received {image_id!r}") return self._delete( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images/{image_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/images/{image_id}", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images/{image_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -209,9 +205,7 @@ def get( if not image_id: raise ValueError(f"Expected a non-empty value for `image_id` but received {image_id!r}") return self._get( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images/{image_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/images/{image_id}", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images/{image_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -286,9 +280,7 @@ def upload( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/images", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images", body=maybe_transform( { "name": name, @@ -430,9 +422,7 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/images", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -477,9 +467,7 @@ async def delete( if not image_id: raise ValueError(f"Expected a non-empty value for `image_id` but received {image_id!r}") return await self._delete( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images/{image_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/images/{image_id}", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images/{image_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -560,9 +548,7 @@ async def get( if not image_id: raise ValueError(f"Expected a non-empty value for `image_id` but received {image_id!r}") return await self._get( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images/{image_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/images/{image_id}", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images/{image_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -637,9 +623,7 @@ async def upload( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/images", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/images", body=await async_maybe_transform( { "name": name, diff --git a/src/gcore/resources/cloud/gpu_baremetal_clusters/interfaces.py b/src/gcore/resources/cloud/gpu_baremetal_clusters/interfaces.py index ad75df3e..863ffde8 100644 --- a/src/gcore/resources/cloud/gpu_baremetal_clusters/interfaces.py +++ b/src/gcore/resources/cloud/gpu_baremetal_clusters/interfaces.py @@ -71,9 +71,7 @@ def list( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return self._get( - f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{cluster_id}/interfaces" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ai/clusters/{project_id}/{region_id}/{cluster_id}/interfaces", + f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{cluster_id}/interfaces", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -133,9 +131,7 @@ async def list( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return await self._get( - f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{cluster_id}/interfaces" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ai/clusters/{project_id}/{region_id}/{cluster_id}/interfaces", + f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{cluster_id}/interfaces", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/gpu_baremetal_clusters/servers.py b/src/gcore/resources/cloud/gpu_baremetal_clusters/servers.py index d08afd04..5943860d 100644 --- a/src/gcore/resources/cloud/gpu_baremetal_clusters/servers.py +++ b/src/gcore/resources/cloud/gpu_baremetal_clusters/servers.py @@ -143,9 +143,7 @@ def list( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return self._get_api_list( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}/servers" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}/servers", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}/servers", page=SyncOffsetPage[GPUBaremetalClusterServer], options=make_request_options( extra_headers=extra_headers, @@ -211,9 +209,7 @@ def delete( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._delete( - f"/cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/node/{instance_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/node/{instance_id}", + f"/cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/node/{instance_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -494,9 +490,7 @@ def attach_interface( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._post( - f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/attach_interface" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/attach_interface", + f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/attach_interface", body=maybe_transform( { "ddos_profile": ddos_profile, @@ -555,9 +549,7 @@ def detach_interface( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._post( - f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/detach_interface" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/detach_interface", + f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/detach_interface", body=maybe_transform( { "ip_address": ip_address, @@ -603,9 +595,7 @@ def get_console( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._get( - f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/get_console" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/get_console", + f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/get_console", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -644,9 +634,7 @@ def powercycle( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._post( - f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/powercycle" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/powercycle", + f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/powercycle", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -685,9 +673,7 @@ def reboot( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._post( - f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/reboot" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/reboot", + f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/reboot", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -804,9 +790,7 @@ def list( if not cluster_id: raise ValueError(f"Expected a non-empty value for `cluster_id` but received {cluster_id!r}") return self._get_api_list( - f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}/servers" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}/servers", + f"/cloud/v3/gpu/baremetal/{project_id}/{region_id}/clusters/{cluster_id}/servers", page=AsyncOffsetPage[GPUBaremetalClusterServer], options=make_request_options( extra_headers=extra_headers, @@ -872,9 +856,7 @@ async def delete( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._delete( - f"/cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/node/{instance_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/node/{instance_id}", + f"/cloud/v1/ai/clusters/gpu/{project_id}/{region_id}/{cluster_id}/node/{instance_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1157,9 +1139,7 @@ async def attach_interface( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._post( - f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/attach_interface" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/attach_interface", + f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/attach_interface", body=await async_maybe_transform( { "ddos_profile": ddos_profile, @@ -1218,9 +1198,7 @@ async def detach_interface( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._post( - f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/detach_interface" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/detach_interface", + f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/detach_interface", body=await async_maybe_transform( { "ip_address": ip_address, @@ -1266,9 +1244,7 @@ async def get_console( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._get( - f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/get_console" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/get_console", + f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/get_console", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1307,9 +1283,7 @@ async def powercycle( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._post( - f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/powercycle" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/powercycle", + f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/powercycle", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1348,9 +1322,7 @@ async def reboot( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._post( - f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/reboot" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/reboot", + f"/cloud/v1/ai/clusters/{project_id}/{region_id}/{instance_id}/reboot", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/inference/api_keys.py b/src/gcore/resources/cloud/inference/api_keys.py index f9f5ccb9..98238c19 100644 --- a/src/gcore/resources/cloud/inference/api_keys.py +++ b/src/gcore/resources/cloud/inference/api_keys.py @@ -84,9 +84,7 @@ def create( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._post( - f"/cloud/v3/inference/{project_id}/api_keys" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/api_keys", + f"/cloud/v3/inference/{project_id}/api_keys", body=maybe_transform( { "name": name, @@ -137,9 +135,7 @@ def update( if not api_key_name: raise ValueError(f"Expected a non-empty value for `api_key_name` but received {api_key_name!r}") return self._patch( - f"/cloud/v3/inference/{project_id}/api_keys/{api_key_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/api_keys/{api_key_name}", + f"/cloud/v3/inference/{project_id}/api_keys/{api_key_name}", body=maybe_transform({"description": description}, api_key_update_params.APIKeyUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -182,9 +178,7 @@ def list( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._get_api_list( - f"/cloud/v3/inference/{project_id}/api_keys" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/api_keys", + f"/cloud/v3/inference/{project_id}/api_keys", page=SyncOffsetPage[InferenceAPIKey], options=make_request_options( extra_headers=extra_headers, @@ -239,9 +233,7 @@ def delete( raise ValueError(f"Expected a non-empty value for `api_key_name` but received {api_key_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v3/inference/{project_id}/api_keys/{api_key_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/api_keys/{api_key_name}", + f"/cloud/v3/inference/{project_id}/api_keys/{api_key_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -281,9 +273,7 @@ def get( if not api_key_name: raise ValueError(f"Expected a non-empty value for `api_key_name` but received {api_key_name!r}") return self._get( - f"/cloud/v3/inference/{project_id}/api_keys/{api_key_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/api_keys/{api_key_name}", + f"/cloud/v3/inference/{project_id}/api_keys/{api_key_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -350,9 +340,7 @@ async def create( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return await self._post( - f"/cloud/v3/inference/{project_id}/api_keys" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/api_keys", + f"/cloud/v3/inference/{project_id}/api_keys", body=await async_maybe_transform( { "name": name, @@ -403,9 +391,7 @@ async def update( if not api_key_name: raise ValueError(f"Expected a non-empty value for `api_key_name` but received {api_key_name!r}") return await self._patch( - f"/cloud/v3/inference/{project_id}/api_keys/{api_key_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/api_keys/{api_key_name}", + f"/cloud/v3/inference/{project_id}/api_keys/{api_key_name}", body=await async_maybe_transform({"description": description}, api_key_update_params.APIKeyUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -448,9 +434,7 @@ def list( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._get_api_list( - f"/cloud/v3/inference/{project_id}/api_keys" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/api_keys", + f"/cloud/v3/inference/{project_id}/api_keys", page=AsyncOffsetPage[InferenceAPIKey], options=make_request_options( extra_headers=extra_headers, @@ -505,9 +489,7 @@ async def delete( raise ValueError(f"Expected a non-empty value for `api_key_name` but received {api_key_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v3/inference/{project_id}/api_keys/{api_key_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/api_keys/{api_key_name}", + f"/cloud/v3/inference/{project_id}/api_keys/{api_key_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -547,9 +529,7 @@ async def get( if not api_key_name: raise ValueError(f"Expected a non-empty value for `api_key_name` but received {api_key_name!r}") return await self._get( - f"/cloud/v3/inference/{project_id}/api_keys/{api_key_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/api_keys/{api_key_name}", + f"/cloud/v3/inference/{project_id}/api_keys/{api_key_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/inference/applications/deployments.py b/src/gcore/resources/cloud/inference/applications/deployments.py index 43b6893f..845bffce 100644 --- a/src/gcore/resources/cloud/inference/applications/deployments.py +++ b/src/gcore/resources/cloud/inference/applications/deployments.py @@ -93,9 +93,7 @@ def create( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._post( - f"/cloud/v3/inference/applications/{project_id}/deployments" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/applications/{project_id}/deployments", + f"/cloud/v3/inference/applications/{project_id}/deployments", body=maybe_transform( { "application_name": application_name, @@ -142,9 +140,7 @@ def list( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._get( - f"/cloud/v3/inference/applications/{project_id}/deployments" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/applications/{project_id}/deployments", + f"/cloud/v3/inference/applications/{project_id}/deployments", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -186,9 +182,7 @@ def delete( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return self._delete( - f"/cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}", + f"/cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -232,9 +226,7 @@ def get( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return self._get( - f"/cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}", + f"/cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -288,9 +280,7 @@ def patch( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return self._patch( - f"/cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}", + f"/cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}", body=maybe_transform( { "api_keys": api_keys, @@ -372,9 +362,7 @@ async def create( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return await self._post( - f"/cloud/v3/inference/applications/{project_id}/deployments" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/applications/{project_id}/deployments", + f"/cloud/v3/inference/applications/{project_id}/deployments", body=await async_maybe_transform( { "application_name": application_name, @@ -421,9 +409,7 @@ async def list( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return await self._get( - f"/cloud/v3/inference/applications/{project_id}/deployments" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/applications/{project_id}/deployments", + f"/cloud/v3/inference/applications/{project_id}/deployments", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -465,9 +451,7 @@ async def delete( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return await self._delete( - f"/cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}", + f"/cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -511,9 +495,7 @@ async def get( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return await self._get( - f"/cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}", + f"/cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -567,9 +549,7 @@ async def patch( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return await self._patch( - f"/cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}", + f"/cloud/v3/inference/applications/{project_id}/deployments/{deployment_name}", body=await async_maybe_transform( { "api_keys": api_keys, diff --git a/src/gcore/resources/cloud/inference/applications/templates.py b/src/gcore/resources/cloud/inference/applications/templates.py index 664203be..1c475cb8 100644 --- a/src/gcore/resources/cloud/inference/applications/templates.py +++ b/src/gcore/resources/cloud/inference/applications/templates.py @@ -58,9 +58,7 @@ def list( required to create a fully functional application deployment. """ return self._get( - "/cloud/v3/inference/applications/catalog" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v3/inference/applications/catalog", + "/cloud/v3/inference/applications/catalog", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -99,9 +97,7 @@ def get( if not application_name: raise ValueError(f"Expected a non-empty value for `application_name` but received {application_name!r}") return self._get( - f"/cloud/v3/inference/applications/catalog/{application_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/applications/catalog/{application_name}", + f"/cloud/v3/inference/applications/catalog/{application_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -147,9 +143,7 @@ async def list( required to create a fully functional application deployment. """ return await self._get( - "/cloud/v3/inference/applications/catalog" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v3/inference/applications/catalog", + "/cloud/v3/inference/applications/catalog", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -188,9 +182,7 @@ async def get( if not application_name: raise ValueError(f"Expected a non-empty value for `application_name` but received {application_name!r}") return await self._get( - f"/cloud/v3/inference/applications/catalog/{application_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/applications/catalog/{application_name}", + f"/cloud/v3/inference/applications/catalog/{application_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/inference/deployments/deployments.py b/src/gcore/resources/cloud/inference/deployments/deployments.py index a652b6fc..533883c2 100644 --- a/src/gcore/resources/cloud/inference/deployments/deployments.py +++ b/src/gcore/resources/cloud/inference/deployments/deployments.py @@ -147,9 +147,7 @@ def create( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._post( - f"/cloud/v3/inference/{project_id}/deployments" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments", + f"/cloud/v3/inference/{project_id}/deployments", body=maybe_transform( { "containers": containers, @@ -265,9 +263,7 @@ def update( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return self._patch( - f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments/{deployment_name}", + f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}", body=maybe_transform( { "api_keys": api_keys, @@ -329,9 +325,7 @@ def list( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._get_api_list( - f"/cloud/v3/inference/{project_id}/deployments" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments", + f"/cloud/v3/inference/{project_id}/deployments", page=SyncOffsetPage[InferenceDeployment], options=make_request_options( extra_headers=extra_headers, @@ -382,9 +376,7 @@ def delete( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return self._delete( - f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments/{deployment_name}", + f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -424,9 +416,7 @@ def get( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return self._get( - f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments/{deployment_name}", + f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -467,9 +457,7 @@ def get_api_key( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return self._get( - f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/apikey" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments/{deployment_name}/apikey", + f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/apikey", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -517,9 +505,7 @@ def start( raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/start" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments/{deployment_name}/start", + f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/start", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -567,9 +553,7 @@ def stop( raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/stop" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments/{deployment_name}/stop", + f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/stop", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -856,9 +840,7 @@ async def create( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return await self._post( - f"/cloud/v3/inference/{project_id}/deployments" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments", + f"/cloud/v3/inference/{project_id}/deployments", body=await async_maybe_transform( { "containers": containers, @@ -974,9 +956,7 @@ async def update( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return await self._patch( - f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments/{deployment_name}", + f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}", body=await async_maybe_transform( { "api_keys": api_keys, @@ -1038,9 +1018,7 @@ def list( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._get_api_list( - f"/cloud/v3/inference/{project_id}/deployments" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments", + f"/cloud/v3/inference/{project_id}/deployments", page=AsyncOffsetPage[InferenceDeployment], options=make_request_options( extra_headers=extra_headers, @@ -1091,9 +1069,7 @@ async def delete( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return await self._delete( - f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments/{deployment_name}", + f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1133,9 +1109,7 @@ async def get( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return await self._get( - f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments/{deployment_name}", + f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1176,9 +1150,7 @@ async def get_api_key( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return await self._get( - f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/apikey" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments/{deployment_name}/apikey", + f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/apikey", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1226,9 +1198,7 @@ async def start( raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/start" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments/{deployment_name}/start", + f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/start", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1276,9 +1246,7 @@ async def stop( raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/stop" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments/{deployment_name}/stop", + f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/stop", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/inference/deployments/logs.py b/src/gcore/resources/cloud/inference/deployments/logs.py index 2ee0666e..1cc65006 100644 --- a/src/gcore/resources/cloud/inference/deployments/logs.py +++ b/src/gcore/resources/cloud/inference/deployments/logs.py @@ -91,9 +91,7 @@ def list( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return self._get_api_list( - f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/logs" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments/{deployment_name}/logs", + f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/logs", page=SyncOffsetPage[InferenceDeploymentLog], options=make_request_options( extra_headers=extra_headers, @@ -180,9 +178,7 @@ def list( if not deployment_name: raise ValueError(f"Expected a non-empty value for `deployment_name` but received {deployment_name!r}") return self._get_api_list( - f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/logs" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/deployments/{deployment_name}/logs", + f"/cloud/v3/inference/{project_id}/deployments/{deployment_name}/logs", page=AsyncOffsetPage[InferenceDeploymentLog], options=make_request_options( extra_headers=extra_headers, diff --git a/src/gcore/resources/cloud/inference/flavors.py b/src/gcore/resources/cloud/inference/flavors.py index 8dcc3e62..d273b19b 100644 --- a/src/gcore/resources/cloud/inference/flavors.py +++ b/src/gcore/resources/cloud/inference/flavors.py @@ -73,9 +73,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v3/inference/flavors" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v3/inference/flavors", + "/cloud/v3/inference/flavors", page=SyncOffsetPage[InferenceFlavor], options=make_request_options( extra_headers=extra_headers, @@ -121,9 +119,7 @@ def get( if not flavor_name: raise ValueError(f"Expected a non-empty value for `flavor_name` but received {flavor_name!r}") return self._get( - f"/cloud/v3/inference/flavors/{flavor_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/flavors/{flavor_name}", + f"/cloud/v3/inference/flavors/{flavor_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -182,9 +178,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v3/inference/flavors" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v3/inference/flavors", + "/cloud/v3/inference/flavors", page=AsyncOffsetPage[InferenceFlavor], options=make_request_options( extra_headers=extra_headers, @@ -230,9 +224,7 @@ async def get( if not flavor_name: raise ValueError(f"Expected a non-empty value for `flavor_name` but received {flavor_name!r}") return await self._get( - f"/cloud/v3/inference/flavors/{flavor_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/flavors/{flavor_name}", + f"/cloud/v3/inference/flavors/{flavor_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/inference/inference.py b/src/gcore/resources/cloud/inference/inference.py index b116b08f..103c70f1 100644 --- a/src/gcore/resources/cloud/inference/inference.py +++ b/src/gcore/resources/cloud/inference/inference.py @@ -123,9 +123,7 @@ def get_capacity_by_region( ) -> InferenceRegionCapacityList: """Get inference capacity by region""" return self._get( - "/cloud/v3/inference/capacity" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v3/inference/capacity", + "/cloud/v3/inference/capacity", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -189,9 +187,7 @@ async def get_capacity_by_region( ) -> InferenceRegionCapacityList: """Get inference capacity by region""" return await self._get( - "/cloud/v3/inference/capacity" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v3/inference/capacity", + "/cloud/v3/inference/capacity", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/inference/registry_credentials.py b/src/gcore/resources/cloud/inference/registry_credentials.py index 9d5a4072..6dd78f70 100644 --- a/src/gcore/resources/cloud/inference/registry_credentials.py +++ b/src/gcore/resources/cloud/inference/registry_credentials.py @@ -86,9 +86,7 @@ def create( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._post( - f"/cloud/v3/inference/{project_id}/registry_credentials" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/registry_credentials", + f"/cloud/v3/inference/{project_id}/registry_credentials", body=maybe_transform( { "name": name, @@ -139,9 +137,7 @@ def list( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._get_api_list( - f"/cloud/v3/inference/{project_id}/registry_credentials" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/registry_credentials", + f"/cloud/v3/inference/{project_id}/registry_credentials", page=SyncOffsetPage[InferenceRegistryCredentials], options=make_request_options( extra_headers=extra_headers, @@ -193,9 +189,7 @@ def delete( raise ValueError(f"Expected a non-empty value for `credential_name` but received {credential_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v3/inference/{project_id}/registry_credentials/{credential_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/registry_credentials/{credential_name}", + f"/cloud/v3/inference/{project_id}/registry_credentials/{credential_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -235,9 +229,7 @@ def get( if not credential_name: raise ValueError(f"Expected a non-empty value for `credential_name` but received {credential_name!r}") return self._get( - f"/cloud/v3/inference/{project_id}/registry_credentials/{credential_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/registry_credentials/{credential_name}", + f"/cloud/v3/inference/{project_id}/registry_credentials/{credential_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -286,9 +278,7 @@ def replace( if not credential_name: raise ValueError(f"Expected a non-empty value for `credential_name` but received {credential_name!r}") return self._put( - f"/cloud/v3/inference/{project_id}/registry_credentials/{credential_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/registry_credentials/{credential_name}", + f"/cloud/v3/inference/{project_id}/registry_credentials/{credential_name}", body=maybe_transform( { "password": password, @@ -364,9 +354,7 @@ async def create( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return await self._post( - f"/cloud/v3/inference/{project_id}/registry_credentials" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/registry_credentials", + f"/cloud/v3/inference/{project_id}/registry_credentials", body=await async_maybe_transform( { "name": name, @@ -417,9 +405,7 @@ def list( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._get_api_list( - f"/cloud/v3/inference/{project_id}/registry_credentials" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/registry_credentials", + f"/cloud/v3/inference/{project_id}/registry_credentials", page=AsyncOffsetPage[InferenceRegistryCredentials], options=make_request_options( extra_headers=extra_headers, @@ -471,9 +457,7 @@ async def delete( raise ValueError(f"Expected a non-empty value for `credential_name` but received {credential_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v3/inference/{project_id}/registry_credentials/{credential_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/registry_credentials/{credential_name}", + f"/cloud/v3/inference/{project_id}/registry_credentials/{credential_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -513,9 +497,7 @@ async def get( if not credential_name: raise ValueError(f"Expected a non-empty value for `credential_name` but received {credential_name!r}") return await self._get( - f"/cloud/v3/inference/{project_id}/registry_credentials/{credential_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/registry_credentials/{credential_name}", + f"/cloud/v3/inference/{project_id}/registry_credentials/{credential_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -564,9 +546,7 @@ async def replace( if not credential_name: raise ValueError(f"Expected a non-empty value for `credential_name` but received {credential_name!r}") return await self._put( - f"/cloud/v3/inference/{project_id}/registry_credentials/{credential_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/registry_credentials/{credential_name}", + f"/cloud/v3/inference/{project_id}/registry_credentials/{credential_name}", body=await async_maybe_transform( { "password": password, diff --git a/src/gcore/resources/cloud/inference/secrets.py b/src/gcore/resources/cloud/inference/secrets.py index ed312faa..275ec3f2 100644 --- a/src/gcore/resources/cloud/inference/secrets.py +++ b/src/gcore/resources/cloud/inference/secrets.py @@ -79,9 +79,7 @@ def create( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._post( - f"/cloud/v3/inference/{project_id}/secrets" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/secrets", + f"/cloud/v3/inference/{project_id}/secrets", body=maybe_transform( { "data": data, @@ -132,9 +130,7 @@ def list( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._get_api_list( - f"/cloud/v3/inference/{project_id}/secrets" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/secrets", + f"/cloud/v3/inference/{project_id}/secrets", page=SyncOffsetPage[InferenceSecret], options=make_request_options( extra_headers=extra_headers, @@ -186,9 +182,7 @@ def delete( raise ValueError(f"Expected a non-empty value for `secret_name` but received {secret_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v3/inference/{project_id}/secrets/{secret_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/secrets/{secret_name}", + f"/cloud/v3/inference/{project_id}/secrets/{secret_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -228,9 +222,7 @@ def get( if not secret_name: raise ValueError(f"Expected a non-empty value for `secret_name` but received {secret_name!r}") return self._get( - f"/cloud/v3/inference/{project_id}/secrets/{secret_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/secrets/{secret_name}", + f"/cloud/v3/inference/{project_id}/secrets/{secret_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -276,9 +268,7 @@ def replace( if not secret_name: raise ValueError(f"Expected a non-empty value for `secret_name` but received {secret_name!r}") return self._put( - f"/cloud/v3/inference/{project_id}/secrets/{secret_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/secrets/{secret_name}", + f"/cloud/v3/inference/{project_id}/secrets/{secret_name}", body=maybe_transform( { "data": data, @@ -350,9 +340,7 @@ async def create( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return await self._post( - f"/cloud/v3/inference/{project_id}/secrets" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/secrets", + f"/cloud/v3/inference/{project_id}/secrets", body=await async_maybe_transform( { "data": data, @@ -403,9 +391,7 @@ def list( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._get_api_list( - f"/cloud/v3/inference/{project_id}/secrets" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/secrets", + f"/cloud/v3/inference/{project_id}/secrets", page=AsyncOffsetPage[InferenceSecret], options=make_request_options( extra_headers=extra_headers, @@ -457,9 +443,7 @@ async def delete( raise ValueError(f"Expected a non-empty value for `secret_name` but received {secret_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v3/inference/{project_id}/secrets/{secret_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/secrets/{secret_name}", + f"/cloud/v3/inference/{project_id}/secrets/{secret_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -499,9 +483,7 @@ async def get( if not secret_name: raise ValueError(f"Expected a non-empty value for `secret_name` but received {secret_name!r}") return await self._get( - f"/cloud/v3/inference/{project_id}/secrets/{secret_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/secrets/{secret_name}", + f"/cloud/v3/inference/{project_id}/secrets/{secret_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -547,9 +529,7 @@ async def replace( if not secret_name: raise ValueError(f"Expected a non-empty value for `secret_name` but received {secret_name!r}") return await self._put( - f"/cloud/v3/inference/{project_id}/secrets/{secret_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v3/inference/{project_id}/secrets/{secret_name}", + f"/cloud/v3/inference/{project_id}/secrets/{secret_name}", body=await async_maybe_transform( { "data": data, diff --git a/src/gcore/resources/cloud/instances/flavors.py b/src/gcore/resources/cloud/instances/flavors.py index 3bf61d85..9bd7f38f 100644 --- a/src/gcore/resources/cloud/instances/flavors.py +++ b/src/gcore/resources/cloud/instances/flavors.py @@ -85,9 +85,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/flavors/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/flavors/{project_id}/{region_id}", + f"/cloud/v1/flavors/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -171,9 +169,7 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/flavors/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/flavors/{project_id}/{region_id}", + f"/cloud/v1/flavors/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/cloud/instances/images.py b/src/gcore/resources/cloud/instances/images.py index b4cdb777..7b13a49a 100644 --- a/src/gcore/resources/cloud/instances/images.py +++ b/src/gcore/resources/cloud/instances/images.py @@ -110,9 +110,7 @@ def update( if not image_id: raise ValueError(f"Expected a non-empty value for `image_id` but received {image_id!r}") return self._patch( - f"/cloud/v1/images/{project_id}/{region_id}/{image_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/images/{project_id}/{region_id}/{image_id}", + f"/cloud/v1/images/{project_id}/{region_id}/{image_id}", body=maybe_transform( { "hw_firmware_type": hw_firmware_type, @@ -178,9 +176,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/images/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/images/{project_id}/{region_id}", + f"/cloud/v1/images/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -234,9 +230,7 @@ def delete( if not image_id: raise ValueError(f"Expected a non-empty value for `image_id` but received {image_id!r}") return self._delete( - f"/cloud/v1/images/{project_id}/{region_id}/{image_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/images/{project_id}/{region_id}/{image_id}", + f"/cloud/v1/images/{project_id}/{region_id}/{image_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -342,9 +336,7 @@ def create_from_volume( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/images/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/images/{project_id}/{region_id}", + f"/cloud/v1/images/{project_id}/{region_id}", body=maybe_transform( { "name": name, @@ -461,9 +453,7 @@ def get( if not image_id: raise ValueError(f"Expected a non-empty value for `image_id` but received {image_id!r}") return self._get( - f"/cloud/v1/images/{project_id}/{region_id}/{image_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/images/{project_id}/{region_id}/{image_id}", + f"/cloud/v1/images/{project_id}/{region_id}/{image_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -546,9 +536,7 @@ def upload( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/downloadimage/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/downloadimage/{project_id}/{region_id}", + f"/cloud/v1/downloadimage/{project_id}/{region_id}", body=maybe_transform( { "name": name, @@ -714,9 +702,7 @@ async def update( if not image_id: raise ValueError(f"Expected a non-empty value for `image_id` but received {image_id!r}") return await self._patch( - f"/cloud/v1/images/{project_id}/{region_id}/{image_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/images/{project_id}/{region_id}/{image_id}", + f"/cloud/v1/images/{project_id}/{region_id}/{image_id}", body=await async_maybe_transform( { "hw_firmware_type": hw_firmware_type, @@ -782,9 +768,7 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/images/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/images/{project_id}/{region_id}", + f"/cloud/v1/images/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -838,9 +822,7 @@ async def delete( if not image_id: raise ValueError(f"Expected a non-empty value for `image_id` but received {image_id!r}") return await self._delete( - f"/cloud/v1/images/{project_id}/{region_id}/{image_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/images/{project_id}/{region_id}/{image_id}", + f"/cloud/v1/images/{project_id}/{region_id}/{image_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -946,9 +928,7 @@ async def create_from_volume( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/images/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/images/{project_id}/{region_id}", + f"/cloud/v1/images/{project_id}/{region_id}", body=await async_maybe_transform( { "name": name, @@ -1065,9 +1045,7 @@ async def get( if not image_id: raise ValueError(f"Expected a non-empty value for `image_id` but received {image_id!r}") return await self._get( - f"/cloud/v1/images/{project_id}/{region_id}/{image_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/images/{project_id}/{region_id}/{image_id}", + f"/cloud/v1/images/{project_id}/{region_id}/{image_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1150,9 +1128,7 @@ async def upload( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/downloadimage/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/downloadimage/{project_id}/{region_id}", + f"/cloud/v1/downloadimage/{project_id}/{region_id}", body=await async_maybe_transform( { "name": name, diff --git a/src/gcore/resources/cloud/instances/instances.py b/src/gcore/resources/cloud/instances/instances.py index 49a07405..6cb7f865 100644 --- a/src/gcore/resources/cloud/instances/instances.py +++ b/src/gcore/resources/cloud/instances/instances.py @@ -228,9 +228,7 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v2/instances/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/instances/{project_id}/{region_id}", + f"/cloud/v2/instances/{project_id}/{region_id}", body=maybe_transform( { "flavor": flavor, @@ -367,9 +365,7 @@ def update( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._patch( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}", body=maybe_transform({"name": name}, instance_update_params.InstanceUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -518,9 +514,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/instances/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}", + f"/cloud/v1/instances/{project_id}/{region_id}", page=SyncOffsetPage[Instance], options=make_request_options( extra_headers=extra_headers, @@ -614,9 +608,7 @@ def delete( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._delete( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -767,9 +759,7 @@ def action( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._post( - f"/cloud/v2/instances/{project_id}/{region_id}/{instance_id}/action" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/instances/{project_id}/{region_id}/{instance_id}/action", + f"/cloud/v2/instances/{project_id}/{region_id}/{instance_id}/action", body=maybe_transform( { "action": action, @@ -939,9 +929,7 @@ def add_to_placement_group( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/put_into_servergroup" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/put_into_servergroup", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/put_into_servergroup", body=maybe_transform( {"servergroup_id": servergroup_id}, instance_add_to_placement_group_params.InstanceAddToPlacementGroupParams, @@ -1036,9 +1024,7 @@ def assign_security_group( raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/addsecuritygroup" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/addsecuritygroup", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/addsecuritygroup", body=maybe_transform( { "name": name, @@ -1084,9 +1070,7 @@ def disable_port_security( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return self._post( - f"/cloud/v1/ports/{project_id}/{region_id}/{port_id}/disable_port_security" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ports/{project_id}/{region_id}/{port_id}/disable_port_security", + f"/cloud/v1/ports/{project_id}/{region_id}/{port_id}/disable_port_security", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1125,9 +1109,7 @@ def enable_port_security( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return self._post( - f"/cloud/v1/ports/{project_id}/{region_id}/{port_id}/enable_port_security" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ports/{project_id}/{region_id}/{port_id}/enable_port_security", + f"/cloud/v1/ports/{project_id}/{region_id}/{port_id}/enable_port_security", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1181,9 +1163,7 @@ def get( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._get( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1225,9 +1205,7 @@ def get_console( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._get( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/get_console" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/get_console", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/get_console", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1274,9 +1252,7 @@ def remove_from_placement_group( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/remove_from_servergroup" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/remove_from_servergroup", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/remove_from_servergroup", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1358,9 +1334,7 @@ def resize( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/changeflavor" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/changeflavor", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/changeflavor", body=maybe_transform({"flavor_id": flavor_id}, instance_resize_params.InstanceResizeParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -1452,9 +1426,7 @@ def unassign_security_group( raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/delsecuritygroup" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/delsecuritygroup", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/delsecuritygroup", body=maybe_transform( { "name": name, @@ -1625,9 +1597,7 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v2/instances/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/instances/{project_id}/{region_id}", + f"/cloud/v2/instances/{project_id}/{region_id}", body=await async_maybe_transform( { "flavor": flavor, @@ -1764,9 +1734,7 @@ async def update( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._patch( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}", body=await async_maybe_transform({"name": name}, instance_update_params.InstanceUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -1915,9 +1883,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/instances/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}", + f"/cloud/v1/instances/{project_id}/{region_id}", page=AsyncOffsetPage[Instance], options=make_request_options( extra_headers=extra_headers, @@ -2011,9 +1977,7 @@ async def delete( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._delete( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2164,9 +2128,7 @@ async def action( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._post( - f"/cloud/v2/instances/{project_id}/{region_id}/{instance_id}/action" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/instances/{project_id}/{region_id}/{instance_id}/action", + f"/cloud/v2/instances/{project_id}/{region_id}/{instance_id}/action", body=await async_maybe_transform( { "action": action, @@ -2336,9 +2298,7 @@ async def add_to_placement_group( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/put_into_servergroup" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/put_into_servergroup", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/put_into_servergroup", body=await async_maybe_transform( {"servergroup_id": servergroup_id}, instance_add_to_placement_group_params.InstanceAddToPlacementGroupParams, @@ -2433,9 +2393,7 @@ async def assign_security_group( raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/addsecuritygroup" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/addsecuritygroup", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/addsecuritygroup", body=await async_maybe_transform( { "name": name, @@ -2481,9 +2439,7 @@ async def disable_port_security( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return await self._post( - f"/cloud/v1/ports/{project_id}/{region_id}/{port_id}/disable_port_security" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ports/{project_id}/{region_id}/{port_id}/disable_port_security", + f"/cloud/v1/ports/{project_id}/{region_id}/{port_id}/disable_port_security", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -2522,9 +2478,7 @@ async def enable_port_security( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return await self._post( - f"/cloud/v1/ports/{project_id}/{region_id}/{port_id}/enable_port_security" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ports/{project_id}/{region_id}/{port_id}/enable_port_security", + f"/cloud/v1/ports/{project_id}/{region_id}/{port_id}/enable_port_security", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -2578,9 +2532,7 @@ async def get( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._get( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -2622,9 +2574,7 @@ async def get_console( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._get( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/get_console" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/get_console", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/get_console", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2671,9 +2621,7 @@ async def remove_from_placement_group( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/remove_from_servergroup" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/remove_from_servergroup", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/remove_from_servergroup", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -2755,9 +2703,7 @@ async def resize( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/changeflavor" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/changeflavor", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/changeflavor", body=await async_maybe_transform({"flavor_id": flavor_id}, instance_resize_params.InstanceResizeParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -2849,9 +2795,7 @@ async def unassign_security_group( raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/delsecuritygroup" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/delsecuritygroup", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/delsecuritygroup", body=await async_maybe_transform( { "name": name, diff --git a/src/gcore/resources/cloud/instances/interfaces.py b/src/gcore/resources/cloud/instances/interfaces.py index c2a2a9fd..5d1c5c35 100644 --- a/src/gcore/resources/cloud/instances/interfaces.py +++ b/src/gcore/resources/cloud/instances/interfaces.py @@ -77,9 +77,7 @@ def list( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._get( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/interfaces" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/interfaces", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/interfaces", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -315,9 +313,7 @@ def attach( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/attach_interface" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/attach_interface", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/attach_interface", body=maybe_transform( { "ddos_profile": ddos_profile, @@ -669,9 +665,7 @@ def detach( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/detach_interface" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/detach_interface", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/detach_interface", body=maybe_transform( { "ip_address": ip_address, @@ -738,9 +732,7 @@ async def list( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._get( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/interfaces" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/interfaces", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/interfaces", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -976,9 +968,7 @@ async def attach( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/attach_interface" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/attach_interface", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/attach_interface", body=await async_maybe_transform( { "ddos_profile": ddos_profile, @@ -1252,9 +1242,7 @@ async def detach( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/detach_interface" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/detach_interface", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/detach_interface", body=await async_maybe_transform( { "ip_address": ip_address, diff --git a/src/gcore/resources/cloud/instances/metrics.py b/src/gcore/resources/cloud/instances/metrics.py index 03ffbcd1..fa058434 100644 --- a/src/gcore/resources/cloud/instances/metrics.py +++ b/src/gcore/resources/cloud/instances/metrics.py @@ -87,9 +87,7 @@ def list( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/metrics" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/metrics", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/metrics", body=maybe_transform( { "time_interval": time_interval, @@ -168,9 +166,7 @@ async def list( if not instance_id: raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") return await self._post( - f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/metrics" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/instances/{project_id}/{region_id}/{instance_id}/metrics", + f"/cloud/v1/instances/{project_id}/{region_id}/{instance_id}/metrics", body=await async_maybe_transform( { "time_interval": time_interval, diff --git a/src/gcore/resources/cloud/ip_ranges.py b/src/gcore/resources/cloud/ip_ranges.py index b0d0c62e..12024d04 100644 --- a/src/gcore/resources/cloud/ip_ranges.py +++ b/src/gcore/resources/cloud/ip_ranges.py @@ -67,9 +67,7 @@ def list( returned. """ return self._get( - "/cloud/public/v1/ipranges/egress" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/public/v1/ipranges/egress", + "/cloud/public/v1/ipranges/egress", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -125,9 +123,7 @@ async def list( returned. """ return await self._get( - "/cloud/public/v1/ipranges/egress" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/public/v1/ipranges/egress", + "/cloud/public/v1/ipranges/egress", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/k8s/clusters/clusters.py b/src/gcore/resources/cloud/k8s/clusters/clusters.py index 198ead21..a778a3b9 100644 --- a/src/gcore/resources/cloud/k8s/clusters/clusters.py +++ b/src/gcore/resources/cloud/k8s/clusters/clusters.py @@ -210,9 +210,7 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}", body=maybe_transform( { "keypair": keypair, @@ -341,9 +339,7 @@ def update( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return self._patch( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}", body=maybe_transform( { "authentication": authentication, @@ -389,9 +385,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -433,9 +427,7 @@ def delete( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return self._delete( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -478,9 +470,7 @@ def get( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -519,9 +509,7 @@ def get_certificate( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/certificates" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/certificates", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/certificates", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -560,9 +548,7 @@ def get_kubeconfig( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/config" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/config", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/config", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -601,9 +587,7 @@ def list_versions_for_upgrade( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/upgrade_versions" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/upgrade_versions", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/upgrade_versions", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -645,9 +629,7 @@ def upgrade( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return self._post( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/upgrade" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/upgrade", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/upgrade", body=maybe_transform({"version": version}, cluster_upgrade_params.ClusterUpgradeParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -817,9 +799,7 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}", body=await async_maybe_transform( { "keypair": keypair, @@ -948,9 +928,7 @@ async def update( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return await self._patch( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}", body=await async_maybe_transform( { "authentication": authentication, @@ -996,9 +974,7 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1040,9 +1016,7 @@ async def delete( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return await self._delete( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1085,9 +1059,7 @@ async def get( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return await self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1126,9 +1098,7 @@ async def get_certificate( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return await self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/certificates" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/certificates", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/certificates", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1167,9 +1137,7 @@ async def get_kubeconfig( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return await self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/config" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/config", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/config", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1208,9 +1176,7 @@ async def list_versions_for_upgrade( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return await self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/upgrade_versions" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/upgrade_versions", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/upgrade_versions", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1252,9 +1218,7 @@ async def upgrade( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return await self._post( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/upgrade" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/upgrade", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/upgrade", body=await async_maybe_transform({"version": version}, cluster_upgrade_params.ClusterUpgradeParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout diff --git a/src/gcore/resources/cloud/k8s/clusters/nodes.py b/src/gcore/resources/cloud/k8s/clusters/nodes.py index d04a0586..b3bd95d8 100644 --- a/src/gcore/resources/cloud/k8s/clusters/nodes.py +++ b/src/gcore/resources/cloud/k8s/clusters/nodes.py @@ -76,9 +76,7 @@ def list( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/instances" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/instances", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/instances", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -126,9 +124,7 @@ def delete( raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/instances/{instance_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/instances/{instance_id}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/instances/{instance_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -191,9 +187,7 @@ async def list( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return await self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/instances" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/instances", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/instances", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -241,9 +235,7 @@ async def delete( raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/instances/{instance_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/instances/{instance_id}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/instances/{instance_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/k8s/clusters/pools/nodes.py b/src/gcore/resources/cloud/k8s/clusters/pools/nodes.py index 8ff64793..903c428e 100644 --- a/src/gcore/resources/cloud/k8s/clusters/pools/nodes.py +++ b/src/gcore/resources/cloud/k8s/clusters/pools/nodes.py @@ -79,9 +79,7 @@ def list( if not pool_name: raise ValueError(f"Expected a non-empty value for `pool_name` but received {pool_name!r}") return self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/instances" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/instances", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/instances", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -132,9 +130,7 @@ def delete( raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/instances/{instance_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/instances/{instance_id}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/instances/{instance_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -200,9 +196,7 @@ async def list( if not pool_name: raise ValueError(f"Expected a non-empty value for `pool_name` but received {pool_name!r}") return await self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/instances" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/instances", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/instances", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -253,9 +247,7 @@ async def delete( raise ValueError(f"Expected a non-empty value for `instance_id` but received {instance_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/instances/{instance_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/instances/{instance_id}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/instances/{instance_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/k8s/clusters/pools/pools.py b/src/gcore/resources/cloud/k8s/clusters/pools/pools.py index b60e3039..0cb81d5a 100644 --- a/src/gcore/resources/cloud/k8s/clusters/pools/pools.py +++ b/src/gcore/resources/cloud/k8s/clusters/pools/pools.py @@ -130,9 +130,7 @@ def create( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return self._post( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools", body=maybe_transform( { "flavor_id": flavor_id, @@ -210,9 +208,7 @@ def update( if not pool_name: raise ValueError(f"Expected a non-empty value for `pool_name` but received {pool_name!r}") return self._patch( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}", body=maybe_transform( { "auto_healing_enabled": auto_healing_enabled, @@ -262,9 +258,7 @@ def list( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -306,9 +300,7 @@ def delete( if not pool_name: raise ValueError(f"Expected a non-empty value for `pool_name` but received {pool_name!r}") return self._delete( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -350,9 +342,7 @@ def get( if not pool_name: raise ValueError(f"Expected a non-empty value for `pool_name` but received {pool_name!r}") return self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -397,9 +387,7 @@ def resize( if not pool_name: raise ValueError(f"Expected a non-empty value for `pool_name` but received {pool_name!r}") return self._post( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/resize" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/resize", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/resize", body=maybe_transform({"node_count": node_count}, pool_resize_params.PoolResizeParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -504,9 +492,7 @@ async def create( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return await self._post( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools", body=await async_maybe_transform( { "flavor_id": flavor_id, @@ -584,9 +570,7 @@ async def update( if not pool_name: raise ValueError(f"Expected a non-empty value for `pool_name` but received {pool_name!r}") return await self._patch( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}", body=await async_maybe_transform( { "auto_healing_enabled": auto_healing_enabled, @@ -636,9 +620,7 @@ async def list( if not cluster_name: raise ValueError(f"Expected a non-empty value for `cluster_name` but received {cluster_name!r}") return await self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -680,9 +662,7 @@ async def delete( if not pool_name: raise ValueError(f"Expected a non-empty value for `pool_name` but received {pool_name!r}") return await self._delete( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -724,9 +704,7 @@ async def get( if not pool_name: raise ValueError(f"Expected a non-empty value for `pool_name` but received {pool_name!r}") return await self._get( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -771,9 +749,7 @@ async def resize( if not pool_name: raise ValueError(f"Expected a non-empty value for `pool_name` but received {pool_name!r}") return await self._post( - f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/resize" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/resize", + f"/cloud/v2/k8s/clusters/{project_id}/{region_id}/{cluster_name}/pools/{pool_name}/resize", body=await async_maybe_transform({"node_count": node_count}, pool_resize_params.PoolResizeParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout diff --git a/src/gcore/resources/cloud/k8s/flavors.py b/src/gcore/resources/cloud/k8s/flavors.py index cd456f26..71781231 100644 --- a/src/gcore/resources/cloud/k8s/flavors.py +++ b/src/gcore/resources/cloud/k8s/flavors.py @@ -79,9 +79,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/k8s/{project_id}/{region_id}/flavors" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/k8s/{project_id}/{region_id}/flavors", + f"/cloud/v1/k8s/{project_id}/{region_id}/flavors", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -157,9 +155,7 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/k8s/{project_id}/{region_id}/flavors" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/k8s/{project_id}/{region_id}/flavors", + f"/cloud/v1/k8s/{project_id}/{region_id}/flavors", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/cloud/k8s/k8s.py b/src/gcore/resources/cloud/k8s/k8s.py index c193fccd..ad74c5fd 100644 --- a/src/gcore/resources/cloud/k8s/k8s.py +++ b/src/gcore/resources/cloud/k8s/k8s.py @@ -92,9 +92,7 @@ def list_versions( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v2/k8s/{project_id}/{region_id}/create_versions" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/{project_id}/{region_id}/create_versions", + f"/cloud/v2/k8s/{project_id}/{region_id}/create_versions", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -159,9 +157,7 @@ async def list_versions( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v2/k8s/{project_id}/{region_id}/create_versions" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/k8s/{project_id}/{region_id}/create_versions", + f"/cloud/v2/k8s/{project_id}/{region_id}/create_versions", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/load_balancers/flavors.py b/src/gcore/resources/cloud/load_balancers/flavors.py index d104d723..48ba2c61 100644 --- a/src/gcore/resources/cloud/load_balancers/flavors.py +++ b/src/gcore/resources/cloud/load_balancers/flavors.py @@ -76,9 +76,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/lbflavors/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/lbflavors/{project_id}/{region_id}", + f"/cloud/v1/lbflavors/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -145,9 +143,7 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/lbflavors/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/lbflavors/{project_id}/{region_id}", + f"/cloud/v1/lbflavors/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/cloud/load_balancers/l7_policies/l7_policies.py b/src/gcore/resources/cloud/load_balancers/l7_policies/l7_policies.py index d956c3e1..fdecdef4 100644 --- a/src/gcore/resources/cloud/load_balancers/l7_policies/l7_policies.py +++ b/src/gcore/resources/cloud/load_balancers/l7_policies/l7_policies.py @@ -118,9 +118,7 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/l7policies/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}", body=maybe_transform( { "action": action, @@ -170,9 +168,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/l7policies/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -211,9 +207,7 @@ def delete( if not l7policy_id: raise ValueError(f"Expected a non-empty value for `l7policy_id` but received {l7policy_id!r}") return self._delete( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -252,9 +246,7 @@ def get( if not l7policy_id: raise ValueError(f"Expected a non-empty value for `l7policy_id` but received {l7policy_id!r}") return self._get( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -322,9 +314,7 @@ def replace( if not l7policy_id: raise ValueError(f"Expected a non-empty value for `l7policy_id` but received {l7policy_id!r}") return self._put( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}", body=maybe_transform( { "action": action, @@ -575,9 +565,7 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/l7policies/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}", body=await async_maybe_transform( { "action": action, @@ -627,9 +615,7 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/l7policies/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -668,9 +654,7 @@ async def delete( if not l7policy_id: raise ValueError(f"Expected a non-empty value for `l7policy_id` but received {l7policy_id!r}") return await self._delete( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -709,9 +693,7 @@ async def get( if not l7policy_id: raise ValueError(f"Expected a non-empty value for `l7policy_id` but received {l7policy_id!r}") return await self._get( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -779,9 +761,7 @@ async def replace( if not l7policy_id: raise ValueError(f"Expected a non-empty value for `l7policy_id` but received {l7policy_id!r}") return await self._put( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}", body=await async_maybe_transform( { "action": action, diff --git a/src/gcore/resources/cloud/load_balancers/l7_policies/rules.py b/src/gcore/resources/cloud/load_balancers/l7_policies/rules.py index f7932093..626bddc8 100644 --- a/src/gcore/resources/cloud/load_balancers/l7_policies/rules.py +++ b/src/gcore/resources/cloud/load_balancers/l7_policies/rules.py @@ -106,9 +106,7 @@ def create( if not l7policy_id: raise ValueError(f"Expected a non-empty value for `l7policy_id` but received {l7policy_id!r}") return self._post( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules", body=maybe_transform( { "compare_type": compare_type, @@ -158,9 +156,7 @@ def list( if not l7policy_id: raise ValueError(f"Expected a non-empty value for `l7policy_id` but received {l7policy_id!r}") return self._get( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -202,9 +198,7 @@ def delete( if not l7rule_id: raise ValueError(f"Expected a non-empty value for `l7rule_id` but received {l7rule_id!r}") return self._delete( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -246,9 +240,7 @@ def get( if not l7rule_id: raise ValueError(f"Expected a non-empty value for `l7rule_id` but received {l7rule_id!r}") return self._get( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -320,9 +312,7 @@ def replace( if not l7rule_id: raise ValueError(f"Expected a non-empty value for `l7rule_id` but received {l7rule_id!r}") return self._put( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}", body=maybe_transform( { "compare_type": compare_type, @@ -585,9 +575,7 @@ async def create( if not l7policy_id: raise ValueError(f"Expected a non-empty value for `l7policy_id` but received {l7policy_id!r}") return await self._post( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules", body=await async_maybe_transform( { "compare_type": compare_type, @@ -637,9 +625,7 @@ async def list( if not l7policy_id: raise ValueError(f"Expected a non-empty value for `l7policy_id` but received {l7policy_id!r}") return await self._get( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -681,9 +667,7 @@ async def delete( if not l7rule_id: raise ValueError(f"Expected a non-empty value for `l7rule_id` but received {l7rule_id!r}") return await self._delete( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -725,9 +709,7 @@ async def get( if not l7rule_id: raise ValueError(f"Expected a non-empty value for `l7rule_id` but received {l7rule_id!r}") return await self._get( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -799,9 +781,7 @@ async def replace( if not l7rule_id: raise ValueError(f"Expected a non-empty value for `l7rule_id` but received {l7rule_id!r}") return await self._put( - f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}", + f"/cloud/v1/l7policies/{project_id}/{region_id}/{l7policy_id}/rules/{l7rule_id}", body=await async_maybe_transform( { "compare_type": compare_type, diff --git a/src/gcore/resources/cloud/load_balancers/listeners.py b/src/gcore/resources/cloud/load_balancers/listeners.py index 91bf23e0..729fe7fe 100644 --- a/src/gcore/resources/cloud/load_balancers/listeners.py +++ b/src/gcore/resources/cloud/load_balancers/listeners.py @@ -127,9 +127,7 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/lblisteners/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/lblisteners/{project_id}/{region_id}", + f"/cloud/v1/lblisteners/{project_id}/{region_id}", body=maybe_transform( { "loadbalancer_id": loadbalancer_id, @@ -221,9 +219,7 @@ def update( if not listener_id: raise ValueError(f"Expected a non-empty value for `listener_id` but received {listener_id!r}") return self._patch( - f"/cloud/v2/lblisteners/{project_id}/{region_id}/{listener_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/lblisteners/{project_id}/{region_id}/{listener_id}", + f"/cloud/v2/lblisteners/{project_id}/{region_id}/{listener_id}", body=maybe_transform( { "allowed_cidrs": allowed_cidrs, @@ -283,9 +279,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/lblisteners/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/lblisteners/{project_id}/{region_id}", + f"/cloud/v1/lblisteners/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -340,9 +334,7 @@ def delete( if not listener_id: raise ValueError(f"Expected a non-empty value for `listener_id` but received {listener_id!r}") return self._delete( - f"/cloud/v1/lblisteners/{project_id}/{region_id}/{listener_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/lblisteners/{project_id}/{region_id}/{listener_id}", + f"/cloud/v1/lblisteners/{project_id}/{region_id}/{listener_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -390,9 +382,7 @@ def get( if not listener_id: raise ValueError(f"Expected a non-empty value for `listener_id` but received {listener_id!r}") return self._get( - f"/cloud/v1/lblisteners/{project_id}/{region_id}/{listener_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/lblisteners/{project_id}/{region_id}/{listener_id}", + f"/cloud/v1/lblisteners/{project_id}/{region_id}/{listener_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -660,9 +650,7 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/lblisteners/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/lblisteners/{project_id}/{region_id}", + f"/cloud/v1/lblisteners/{project_id}/{region_id}", body=await async_maybe_transform( { "loadbalancer_id": loadbalancer_id, @@ -754,9 +742,7 @@ async def update( if not listener_id: raise ValueError(f"Expected a non-empty value for `listener_id` but received {listener_id!r}") return await self._patch( - f"/cloud/v2/lblisteners/{project_id}/{region_id}/{listener_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/lblisteners/{project_id}/{region_id}/{listener_id}", + f"/cloud/v2/lblisteners/{project_id}/{region_id}/{listener_id}", body=await async_maybe_transform( { "allowed_cidrs": allowed_cidrs, @@ -816,9 +802,7 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/lblisteners/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/lblisteners/{project_id}/{region_id}", + f"/cloud/v1/lblisteners/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -873,9 +857,7 @@ async def delete( if not listener_id: raise ValueError(f"Expected a non-empty value for `listener_id` but received {listener_id!r}") return await self._delete( - f"/cloud/v1/lblisteners/{project_id}/{region_id}/{listener_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/lblisteners/{project_id}/{region_id}/{listener_id}", + f"/cloud/v1/lblisteners/{project_id}/{region_id}/{listener_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -923,9 +905,7 @@ async def get( if not listener_id: raise ValueError(f"Expected a non-empty value for `listener_id` but received {listener_id!r}") return await self._get( - f"/cloud/v1/lblisteners/{project_id}/{region_id}/{listener_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/lblisteners/{project_id}/{region_id}/{listener_id}", + f"/cloud/v1/lblisteners/{project_id}/{region_id}/{listener_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/cloud/load_balancers/load_balancers.py b/src/gcore/resources/cloud/load_balancers/load_balancers.py index 9268ec81..9f5f7bce 100644 --- a/src/gcore/resources/cloud/load_balancers/load_balancers.py +++ b/src/gcore/resources/cloud/load_balancers/load_balancers.py @@ -207,9 +207,7 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}", body=maybe_transform( { "flavor": flavor, @@ -299,9 +297,7 @@ def update( if not loadbalancer_id: raise ValueError(f"Expected a non-empty value for `loadbalancer_id` but received {loadbalancer_id!r}") return self._patch( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}", body=maybe_transform( { "logging": logging, @@ -379,9 +375,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}", page=SyncOffsetPage[LoadBalancer], options=make_request_options( extra_headers=extra_headers, @@ -439,9 +433,7 @@ def delete( if not loadbalancer_id: raise ValueError(f"Expected a non-empty value for `loadbalancer_id` but received {loadbalancer_id!r}") return self._delete( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -483,9 +475,7 @@ def failover( if not loadbalancer_id: raise ValueError(f"Expected a non-empty value for `loadbalancer_id` but received {loadbalancer_id!r}") return self._post( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/failover" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/failover", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/failover", body=maybe_transform({"force": force}, load_balancer_failover_params.LoadBalancerFailoverParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -531,9 +521,7 @@ def get( if not loadbalancer_id: raise ValueError(f"Expected a non-empty value for `loadbalancer_id` but received {loadbalancer_id!r}") return self._get( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -585,9 +573,7 @@ def resize( if not loadbalancer_id: raise ValueError(f"Expected a non-empty value for `loadbalancer_id` but received {loadbalancer_id!r}") return self._post( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/resize" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/resize", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/resize", body=maybe_transform({"flavor": flavor}, load_balancer_resize_params.LoadBalancerResizeParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -904,9 +890,7 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}", body=await async_maybe_transform( { "flavor": flavor, @@ -996,9 +980,7 @@ async def update( if not loadbalancer_id: raise ValueError(f"Expected a non-empty value for `loadbalancer_id` but received {loadbalancer_id!r}") return await self._patch( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}", body=await async_maybe_transform( { "logging": logging, @@ -1076,9 +1058,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}", page=AsyncOffsetPage[LoadBalancer], options=make_request_options( extra_headers=extra_headers, @@ -1136,9 +1116,7 @@ async def delete( if not loadbalancer_id: raise ValueError(f"Expected a non-empty value for `loadbalancer_id` but received {loadbalancer_id!r}") return await self._delete( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1180,9 +1158,7 @@ async def failover( if not loadbalancer_id: raise ValueError(f"Expected a non-empty value for `loadbalancer_id` but received {loadbalancer_id!r}") return await self._post( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/failover" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/failover", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/failover", body=await async_maybe_transform( {"force": force}, load_balancer_failover_params.LoadBalancerFailoverParams ), @@ -1230,9 +1206,7 @@ async def get( if not loadbalancer_id: raise ValueError(f"Expected a non-empty value for `loadbalancer_id` but received {loadbalancer_id!r}") return await self._get( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1284,9 +1258,7 @@ async def resize( if not loadbalancer_id: raise ValueError(f"Expected a non-empty value for `loadbalancer_id` but received {loadbalancer_id!r}") return await self._post( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/resize" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/resize", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/resize", body=await async_maybe_transform({"flavor": flavor}, load_balancer_resize_params.LoadBalancerResizeParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout diff --git a/src/gcore/resources/cloud/load_balancers/metrics.py b/src/gcore/resources/cloud/load_balancers/metrics.py index dd0dedd2..59df8038 100644 --- a/src/gcore/resources/cloud/load_balancers/metrics.py +++ b/src/gcore/resources/cloud/load_balancers/metrics.py @@ -81,9 +81,7 @@ def list( if not loadbalancer_id: raise ValueError(f"Expected a non-empty value for `loadbalancer_id` but received {loadbalancer_id!r}") return self._post( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/metrics" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/metrics", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/metrics", body=maybe_transform( { "time_interval": time_interval, @@ -156,9 +154,7 @@ async def list( if not loadbalancer_id: raise ValueError(f"Expected a non-empty value for `loadbalancer_id` but received {loadbalancer_id!r}") return await self._post( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/metrics" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/metrics", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/metrics", body=await async_maybe_transform( { "time_interval": time_interval, diff --git a/src/gcore/resources/cloud/load_balancers/pools/health_monitors.py b/src/gcore/resources/cloud/load_balancers/pools/health_monitors.py index 417ae8b0..bae1858c 100644 --- a/src/gcore/resources/cloud/load_balancers/pools/health_monitors.py +++ b/src/gcore/resources/cloud/load_balancers/pools/health_monitors.py @@ -115,9 +115,7 @@ def create( if not pool_id: raise ValueError(f"Expected a non-empty value for `pool_id` but received {pool_id!r}") return self._post( - f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/healthmonitor" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/healthmonitor", + f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/healthmonitor", body=maybe_transform( { "delay": delay, @@ -179,9 +177,7 @@ def delete( raise ValueError(f"Expected a non-empty value for `pool_id` but received {pool_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/healthmonitor" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/healthmonitor", + f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/healthmonitor", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -278,9 +274,7 @@ async def create( if not pool_id: raise ValueError(f"Expected a non-empty value for `pool_id` but received {pool_id!r}") return await self._post( - f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/healthmonitor" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/healthmonitor", + f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/healthmonitor", body=await async_maybe_transform( { "delay": delay, @@ -342,9 +336,7 @@ async def delete( raise ValueError(f"Expected a non-empty value for `pool_id` but received {pool_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/healthmonitor" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/healthmonitor", + f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/healthmonitor", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/load_balancers/pools/members.py b/src/gcore/resources/cloud/load_balancers/pools/members.py index 37faaa3a..05091a8b 100644 --- a/src/gcore/resources/cloud/load_balancers/pools/members.py +++ b/src/gcore/resources/cloud/load_balancers/pools/members.py @@ -131,9 +131,7 @@ def add( if not pool_id: raise ValueError(f"Expected a non-empty value for `pool_id` but received {pool_id!r}") return self._post( - f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/member" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/member", + f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/member", body=maybe_transform( { "address": address, @@ -197,9 +195,7 @@ def remove( if not member_id: raise ValueError(f"Expected a non-empty value for `member_id` but received {member_id!r}") return self._delete( - f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/member/{member_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/member/{member_id}", + f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/member/{member_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -315,9 +311,7 @@ async def add( if not pool_id: raise ValueError(f"Expected a non-empty value for `pool_id` but received {pool_id!r}") return await self._post( - f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/member" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/member", + f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/member", body=await async_maybe_transform( { "address": address, @@ -381,9 +375,7 @@ async def remove( if not member_id: raise ValueError(f"Expected a non-empty value for `member_id` but received {member_id!r}") return await self._delete( - f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/member/{member_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/member/{member_id}", + f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}/member/{member_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/load_balancers/pools/pools.py b/src/gcore/resources/cloud/load_balancers/pools/pools.py index 68f8f7d1..e15c696f 100644 --- a/src/gcore/resources/cloud/load_balancers/pools/pools.py +++ b/src/gcore/resources/cloud/load_balancers/pools/pools.py @@ -147,9 +147,7 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/lbpools/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}", + f"/cloud/v1/lbpools/{project_id}/{region_id}", body=maybe_transform( { "lb_algorithm": lb_algorithm, @@ -264,9 +262,7 @@ def update( if not pool_id: raise ValueError(f"Expected a non-empty value for `pool_id` but received {pool_id!r}") return self._patch( - f"/cloud/v2/lbpools/{project_id}/{region_id}/{pool_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/lbpools/{project_id}/{region_id}/{pool_id}", + f"/cloud/v2/lbpools/{project_id}/{region_id}/{pool_id}", body=maybe_transform( { "ca_secret_id": ca_secret_id, @@ -332,9 +328,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/lbpools/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}", + f"/cloud/v1/lbpools/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -390,9 +384,7 @@ def delete( if not pool_id: raise ValueError(f"Expected a non-empty value for `pool_id` but received {pool_id!r}") return self._delete( - f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}", + f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -437,9 +429,7 @@ def get( if not pool_id: raise ValueError(f"Expected a non-empty value for `pool_id` but received {pool_id!r}") return self._get( - f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}", + f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -715,9 +705,7 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/lbpools/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}", + f"/cloud/v1/lbpools/{project_id}/{region_id}", body=await async_maybe_transform( { "lb_algorithm": lb_algorithm, @@ -832,9 +820,7 @@ async def update( if not pool_id: raise ValueError(f"Expected a non-empty value for `pool_id` but received {pool_id!r}") return await self._patch( - f"/cloud/v2/lbpools/{project_id}/{region_id}/{pool_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/lbpools/{project_id}/{region_id}/{pool_id}", + f"/cloud/v2/lbpools/{project_id}/{region_id}/{pool_id}", body=await async_maybe_transform( { "ca_secret_id": ca_secret_id, @@ -900,9 +886,7 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/lbpools/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}", + f"/cloud/v1/lbpools/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -958,9 +942,7 @@ async def delete( if not pool_id: raise ValueError(f"Expected a non-empty value for `pool_id` but received {pool_id!r}") return await self._delete( - f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}", + f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1005,9 +987,7 @@ async def get( if not pool_id: raise ValueError(f"Expected a non-empty value for `pool_id` but received {pool_id!r}") return await self._get( - f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}", + f"/cloud/v1/lbpools/{project_id}/{region_id}/{pool_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/load_balancers/statuses.py b/src/gcore/resources/cloud/load_balancers/statuses.py index e99f90c9..5579e857 100644 --- a/src/gcore/resources/cloud/load_balancers/statuses.py +++ b/src/gcore/resources/cloud/load_balancers/statuses.py @@ -69,9 +69,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/status" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/status", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/status", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -110,9 +108,7 @@ def get( if not loadbalancer_id: raise ValueError(f"Expected a non-empty value for `loadbalancer_id` but received {loadbalancer_id!r}") return self._get( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/status" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/status", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/status", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -169,9 +165,7 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/status" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/status", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/status", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -210,9 +204,7 @@ async def get( if not loadbalancer_id: raise ValueError(f"Expected a non-empty value for `loadbalancer_id` but received {loadbalancer_id!r}") return await self._get( - f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/status" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/status", + f"/cloud/v1/loadbalancers/{project_id}/{region_id}/{loadbalancer_id}/status", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/networks/networks.py b/src/gcore/resources/cloud/networks/networks.py index 8a5a1869..09de9d55 100644 --- a/src/gcore/resources/cloud/networks/networks.py +++ b/src/gcore/resources/cloud/networks/networks.py @@ -120,9 +120,7 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/networks/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/networks/{project_id}/{region_id}", + f"/cloud/v1/networks/{project_id}/{region_id}", body=maybe_transform( { "name": name, @@ -253,9 +251,7 @@ def update( if not network_id: raise ValueError(f"Expected a non-empty value for `network_id` but received {network_id!r}") return self._patch( - f"/cloud/v1/networks/{project_id}/{region_id}/{network_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/networks/{project_id}/{region_id}/{network_id}", + f"/cloud/v1/networks/{project_id}/{region_id}/{network_id}", body=maybe_transform( { "name": name, @@ -322,9 +318,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/networks/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/networks/{project_id}/{region_id}", + f"/cloud/v1/networks/{project_id}/{region_id}", page=SyncOffsetPage[Network], options=make_request_options( extra_headers=extra_headers, @@ -384,9 +378,7 @@ def delete( if not network_id: raise ValueError(f"Expected a non-empty value for `network_id` but received {network_id!r}") return self._delete( - f"/cloud/v1/networks/{project_id}/{region_id}/{network_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/networks/{project_id}/{region_id}/{network_id}", + f"/cloud/v1/networks/{project_id}/{region_id}/{network_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -463,9 +455,7 @@ def get( if not network_id: raise ValueError(f"Expected a non-empty value for `network_id` but received {network_id!r}") return self._get( - f"/cloud/v1/networks/{project_id}/{region_id}/{network_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/networks/{project_id}/{region_id}/{network_id}", + f"/cloud/v1/networks/{project_id}/{region_id}/{network_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -550,9 +540,7 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/networks/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/networks/{project_id}/{region_id}", + f"/cloud/v1/networks/{project_id}/{region_id}", body=await async_maybe_transform( { "name": name, @@ -683,9 +671,7 @@ async def update( if not network_id: raise ValueError(f"Expected a non-empty value for `network_id` but received {network_id!r}") return await self._patch( - f"/cloud/v1/networks/{project_id}/{region_id}/{network_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/networks/{project_id}/{region_id}/{network_id}", + f"/cloud/v1/networks/{project_id}/{region_id}/{network_id}", body=await async_maybe_transform( { "name": name, @@ -752,9 +738,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/networks/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/networks/{project_id}/{region_id}", + f"/cloud/v1/networks/{project_id}/{region_id}", page=AsyncOffsetPage[Network], options=make_request_options( extra_headers=extra_headers, @@ -814,9 +798,7 @@ async def delete( if not network_id: raise ValueError(f"Expected a non-empty value for `network_id` but received {network_id!r}") return await self._delete( - f"/cloud/v1/networks/{project_id}/{region_id}/{network_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/networks/{project_id}/{region_id}/{network_id}", + f"/cloud/v1/networks/{project_id}/{region_id}/{network_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -893,9 +875,7 @@ async def get( if not network_id: raise ValueError(f"Expected a non-empty value for `network_id` but received {network_id!r}") return await self._get( - f"/cloud/v1/networks/{project_id}/{region_id}/{network_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/networks/{project_id}/{region_id}/{network_id}", + f"/cloud/v1/networks/{project_id}/{region_id}/{network_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/networks/routers.py b/src/gcore/resources/cloud/networks/routers.py index 93596051..657982bd 100644 --- a/src/gcore/resources/cloud/networks/routers.py +++ b/src/gcore/resources/cloud/networks/routers.py @@ -92,9 +92,7 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/routers/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/routers/{project_id}/{region_id}", + f"/cloud/v1/routers/{project_id}/{region_id}", body=maybe_transform( { "name": name, @@ -151,9 +149,7 @@ def update( if not router_id: raise ValueError(f"Expected a non-empty value for `router_id` but received {router_id!r}") return self._patch( - f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/routers/{project_id}/{region_id}/{router_id}", + f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}", body=maybe_transform( { "external_gateway_info": external_gateway_info, @@ -203,9 +199,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/routers/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/routers/{project_id}/{region_id}", + f"/cloud/v1/routers/{project_id}/{region_id}", page=SyncOffsetPage[Router], options=make_request_options( extra_headers=extra_headers, @@ -255,9 +249,7 @@ def delete( if not router_id: raise ValueError(f"Expected a non-empty value for `router_id` but received {router_id!r}") return self._delete( - f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/routers/{project_id}/{region_id}/{router_id}", + f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -309,9 +301,7 @@ def attach_subnet( if not router_id: raise ValueError(f"Expected a non-empty value for `router_id` but received {router_id!r}") return self._post( - f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}/attach" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/routers/{project_id}/{region_id}/{router_id}/attach", + f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}/attach", body=maybe_transform( { "subnet_id": subnet_id, @@ -360,9 +350,7 @@ def detach_subnet( if not router_id: raise ValueError(f"Expected a non-empty value for `router_id` but received {router_id!r}") return self._post( - f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}/detach" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/routers/{project_id}/{region_id}/{router_id}/detach", + f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}/detach", body=maybe_transform({"subnet_id": subnet_id}, router_detach_subnet_params.RouterDetachSubnetParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -402,9 +390,7 @@ def get( if not router_id: raise ValueError(f"Expected a non-empty value for `router_id` but received {router_id!r}") return self._get( - f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/routers/{project_id}/{region_id}/{router_id}", + f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -473,9 +459,7 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/routers/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/routers/{project_id}/{region_id}", + f"/cloud/v1/routers/{project_id}/{region_id}", body=await async_maybe_transform( { "name": name, @@ -532,9 +516,7 @@ async def update( if not router_id: raise ValueError(f"Expected a non-empty value for `router_id` but received {router_id!r}") return await self._patch( - f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/routers/{project_id}/{region_id}/{router_id}", + f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}", body=await async_maybe_transform( { "external_gateway_info": external_gateway_info, @@ -584,9 +566,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/routers/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/routers/{project_id}/{region_id}", + f"/cloud/v1/routers/{project_id}/{region_id}", page=AsyncOffsetPage[Router], options=make_request_options( extra_headers=extra_headers, @@ -636,9 +616,7 @@ async def delete( if not router_id: raise ValueError(f"Expected a non-empty value for `router_id` but received {router_id!r}") return await self._delete( - f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/routers/{project_id}/{region_id}/{router_id}", + f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -690,9 +668,7 @@ async def attach_subnet( if not router_id: raise ValueError(f"Expected a non-empty value for `router_id` but received {router_id!r}") return await self._post( - f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}/attach" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/routers/{project_id}/{region_id}/{router_id}/attach", + f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}/attach", body=await async_maybe_transform( { "subnet_id": subnet_id, @@ -741,9 +717,7 @@ async def detach_subnet( if not router_id: raise ValueError(f"Expected a non-empty value for `router_id` but received {router_id!r}") return await self._post( - f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}/detach" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/routers/{project_id}/{region_id}/{router_id}/detach", + f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}/detach", body=await async_maybe_transform( {"subnet_id": subnet_id}, router_detach_subnet_params.RouterDetachSubnetParams ), @@ -785,9 +759,7 @@ async def get( if not router_id: raise ValueError(f"Expected a non-empty value for `router_id` but received {router_id!r}") return await self._get( - f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/routers/{project_id}/{region_id}/{router_id}", + f"/cloud/v1/routers/{project_id}/{region_id}/{router_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/networks/subnets.py b/src/gcore/resources/cloud/networks/subnets.py index 53b7c068..1b66df06 100644 --- a/src/gcore/resources/cloud/networks/subnets.py +++ b/src/gcore/resources/cloud/networks/subnets.py @@ -125,9 +125,7 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/subnets/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/subnets/{project_id}/{region_id}", + f"/cloud/v1/subnets/{project_id}/{region_id}", body=maybe_transform( { "cidr": cidr, @@ -287,9 +285,7 @@ def update( if not subnet_id: raise ValueError(f"Expected a non-empty value for `subnet_id` but received {subnet_id!r}") return self._patch( - f"/cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}", + f"/cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}", body=maybe_transform( { "dns_nameservers": dns_nameservers, @@ -375,9 +371,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/subnets/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/subnets/{project_id}/{region_id}", + f"/cloud/v1/subnets/{project_id}/{region_id}", page=SyncOffsetPage[Subnet], options=make_request_options( extra_headers=extra_headers, @@ -438,9 +432,7 @@ def delete( raise ValueError(f"Expected a non-empty value for `subnet_id` but received {subnet_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}", + f"/cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -485,9 +477,7 @@ def get( if not subnet_id: raise ValueError(f"Expected a non-empty value for `subnet_id` but received {subnet_id!r}") return self._get( - f"/cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}", + f"/cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -591,9 +581,7 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/subnets/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/subnets/{project_id}/{region_id}", + f"/cloud/v1/subnets/{project_id}/{region_id}", body=await async_maybe_transform( { "cidr": cidr, @@ -753,9 +741,7 @@ async def update( if not subnet_id: raise ValueError(f"Expected a non-empty value for `subnet_id` but received {subnet_id!r}") return await self._patch( - f"/cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}", + f"/cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}", body=await async_maybe_transform( { "dns_nameservers": dns_nameservers, @@ -841,9 +827,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/subnets/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/subnets/{project_id}/{region_id}", + f"/cloud/v1/subnets/{project_id}/{region_id}", page=AsyncOffsetPage[Subnet], options=make_request_options( extra_headers=extra_headers, @@ -904,9 +888,7 @@ async def delete( raise ValueError(f"Expected a non-empty value for `subnet_id` but received {subnet_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}", + f"/cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -951,9 +933,7 @@ async def get( if not subnet_id: raise ValueError(f"Expected a non-empty value for `subnet_id` but received {subnet_id!r}") return await self._get( - f"/cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}", + f"/cloud/v1/subnets/{project_id}/{region_id}/{subnet_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/placement_groups.py b/src/gcore/resources/cloud/placement_groups.py index 4c3a5142..31777c13 100644 --- a/src/gcore/resources/cloud/placement_groups.py +++ b/src/gcore/resources/cloud/placement_groups.py @@ -80,9 +80,7 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/servergroups/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/servergroups/{project_id}/{region_id}", + f"/cloud/v1/servergroups/{project_id}/{region_id}", body=maybe_transform( { "name": name, @@ -125,9 +123,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/servergroups/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/servergroups/{project_id}/{region_id}", + f"/cloud/v1/servergroups/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -166,9 +162,7 @@ def delete( if not group_id: raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") return self._delete( - f"/cloud/v1/servergroups/{project_id}/{region_id}/{group_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/servergroups/{project_id}/{region_id}/{group_id}", + f"/cloud/v1/servergroups/{project_id}/{region_id}/{group_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -207,9 +201,7 @@ def get( if not group_id: raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") return self._get( - f"/cloud/v1/servergroups/{project_id}/{region_id}/{group_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/servergroups/{project_id}/{region_id}/{group_id}", + f"/cloud/v1/servergroups/{project_id}/{region_id}/{group_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -272,9 +264,7 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/servergroups/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/servergroups/{project_id}/{region_id}", + f"/cloud/v1/servergroups/{project_id}/{region_id}", body=await async_maybe_transform( { "name": name, @@ -317,9 +307,7 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/servergroups/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/servergroups/{project_id}/{region_id}", + f"/cloud/v1/servergroups/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -358,9 +346,7 @@ async def delete( if not group_id: raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") return await self._delete( - f"/cloud/v1/servergroups/{project_id}/{region_id}/{group_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/servergroups/{project_id}/{region_id}/{group_id}", + f"/cloud/v1/servergroups/{project_id}/{region_id}/{group_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -399,9 +385,7 @@ async def get( if not group_id: raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") return await self._get( - f"/cloud/v1/servergroups/{project_id}/{region_id}/{group_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/servergroups/{project_id}/{region_id}/{group_id}", + f"/cloud/v1/servergroups/{project_id}/{region_id}/{group_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/projects.py b/src/gcore/resources/cloud/projects.py index 0603b072..383f3c3b 100644 --- a/src/gcore/resources/cloud/projects.py +++ b/src/gcore/resources/cloud/projects.py @@ -83,7 +83,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/cloud/v1/projects" if self._client._base_url_overridden else "https://api.gcore.com//cloud/v1/projects", + "/cloud/v1/projects", body=maybe_transform( { "name": name, @@ -142,7 +142,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v1/projects" if self._client._base_url_overridden else "https://api.gcore.com//cloud/v1/projects", + "/cloud/v1/projects", page=SyncOffsetPage[Project], options=make_request_options( extra_headers=extra_headers, @@ -193,9 +193,7 @@ def delete( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._delete( - f"/cloud/v1/projects/{project_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/projects/{project_id}", + f"/cloud/v1/projects/{project_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -228,9 +226,7 @@ def get( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._get( - f"/cloud/v1/projects/{project_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/projects/{project_id}", + f"/cloud/v1/projects/{project_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -271,9 +267,7 @@ def replace( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._put( - f"/cloud/v1/projects/{project_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/projects/{project_id}", + f"/cloud/v1/projects/{project_id}", body=maybe_transform( { "name": name, @@ -345,7 +339,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/cloud/v1/projects" if self._client._base_url_overridden else "https://api.gcore.com//cloud/v1/projects", + "/cloud/v1/projects", body=await async_maybe_transform( { "name": name, @@ -404,7 +398,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v1/projects" if self._client._base_url_overridden else "https://api.gcore.com//cloud/v1/projects", + "/cloud/v1/projects", page=AsyncOffsetPage[Project], options=make_request_options( extra_headers=extra_headers, @@ -455,9 +449,7 @@ async def delete( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return await self._delete( - f"/cloud/v1/projects/{project_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/projects/{project_id}", + f"/cloud/v1/projects/{project_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -490,9 +482,7 @@ async def get( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return await self._get( - f"/cloud/v1/projects/{project_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/projects/{project_id}", + f"/cloud/v1/projects/{project_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -533,9 +523,7 @@ async def replace( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return await self._put( - f"/cloud/v1/projects/{project_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/projects/{project_id}", + f"/cloud/v1/projects/{project_id}", body=await async_maybe_transform( { "name": name, diff --git a/src/gcore/resources/cloud/quotas/quotas.py b/src/gcore/resources/cloud/quotas/quotas.py index 17a7d75a..9a9f9c82 100644 --- a/src/gcore/resources/cloud/quotas/quotas.py +++ b/src/gcore/resources/cloud/quotas/quotas.py @@ -65,9 +65,7 @@ def get_all( ) -> QuotaGetAllResponse: """Get combined client quotas, including both regional and global quotas.""" return self._get( - "/cloud/v2/client_quotas" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v2/client_quotas", + "/cloud/v2/client_quotas", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -105,9 +103,7 @@ def get_by_region( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v2/regional_quotas/{client_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/regional_quotas/{client_id}/{region_id}", + f"/cloud/v2/regional_quotas/{client_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -140,9 +136,7 @@ def get_global( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/cloud/v2/global_quotas/{client_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/global_quotas/{client_id}", + f"/cloud/v2/global_quotas/{client_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -186,9 +180,7 @@ async def get_all( ) -> QuotaGetAllResponse: """Get combined client quotas, including both regional and global quotas.""" return await self._get( - "/cloud/v2/client_quotas" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v2/client_quotas", + "/cloud/v2/client_quotas", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -226,9 +218,7 @@ async def get_by_region( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v2/regional_quotas/{client_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/regional_quotas/{client_id}/{region_id}", + f"/cloud/v2/regional_quotas/{client_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -261,9 +251,7 @@ async def get_global( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/cloud/v2/global_quotas/{client_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/global_quotas/{client_id}", + f"/cloud/v2/global_quotas/{client_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/quotas/requests.py b/src/gcore/resources/cloud/quotas/requests.py index 4c49c8b0..79d4febe 100644 --- a/src/gcore/resources/cloud/quotas/requests.py +++ b/src/gcore/resources/cloud/quotas/requests.py @@ -79,9 +79,7 @@ def create( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - "/cloud/v2/limits_request" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v2/limits_request", + "/cloud/v2/limits_request", body=maybe_transform( { "description": description, @@ -129,9 +127,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v2/limits_request" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v2/limits_request", + "/cloud/v2/limits_request", page=SyncOffsetPage[RequestListResponse], options=make_request_options( extra_headers=extra_headers, @@ -177,9 +173,7 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v2/limits_request/{request_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/limits_request/{request_id}", + f"/cloud/v2/limits_request/{request_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -212,9 +206,7 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/cloud/v2/limits_request/{request_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/limits_request/{request_id}", + f"/cloud/v2/limits_request/{request_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -275,9 +267,7 @@ async def create( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - "/cloud/v2/limits_request" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v2/limits_request", + "/cloud/v2/limits_request", body=await async_maybe_transform( { "description": description, @@ -325,9 +315,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v2/limits_request" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v2/limits_request", + "/cloud/v2/limits_request", page=AsyncOffsetPage[RequestListResponse], options=make_request_options( extra_headers=extra_headers, @@ -373,9 +361,7 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v2/limits_request/{request_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/limits_request/{request_id}", + f"/cloud/v2/limits_request/{request_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -408,9 +394,7 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/cloud/v2/limits_request/{request_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/limits_request/{request_id}", + f"/cloud/v2/limits_request/{request_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/regions.py b/src/gcore/resources/cloud/regions.py index df9da044..b49adfcd 100644 --- a/src/gcore/resources/cloud/regions.py +++ b/src/gcore/resources/cloud/regions.py @@ -86,7 +86,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v1/regions" if self._client._base_url_overridden else "https://api.gcore.com//cloud/v1/regions", + "/cloud/v1/regions", page=SyncOffsetPage[Region], options=make_request_options( extra_headers=extra_headers, @@ -139,9 +139,7 @@ def get( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/regions/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/regions/{region_id}", + f"/cloud/v1/regions/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -215,7 +213,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v1/regions" if self._client._base_url_overridden else "https://api.gcore.com//cloud/v1/regions", + "/cloud/v1/regions", page=AsyncOffsetPage[Region], options=make_request_options( extra_headers=extra_headers, @@ -268,9 +266,7 @@ async def get( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/regions/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/regions/{region_id}", + f"/cloud/v1/regions/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/cloud/registries/artifacts.py b/src/gcore/resources/cloud/registries/artifacts.py index 77496af1..0b579ba5 100644 --- a/src/gcore/resources/cloud/registries/artifacts.py +++ b/src/gcore/resources/cloud/registries/artifacts.py @@ -72,9 +72,7 @@ def list( if not repository_name: raise ValueError(f"Expected a non-empty value for `repository_name` but received {repository_name!r}") return self._get( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -118,9 +116,7 @@ def delete( raise ValueError(f"Expected a non-empty value for `digest` but received {digest!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts/{digest}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts/{digest}", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts/{digest}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -181,9 +177,7 @@ async def list( if not repository_name: raise ValueError(f"Expected a non-empty value for `repository_name` but received {repository_name!r}") return await self._get( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -227,9 +221,7 @@ async def delete( raise ValueError(f"Expected a non-empty value for `digest` but received {digest!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts/{digest}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts/{digest}", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts/{digest}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/registries/registries.py b/src/gcore/resources/cloud/registries/registries.py index b8623cf3..8889d473 100644 --- a/src/gcore/resources/cloud/registries/registries.py +++ b/src/gcore/resources/cloud/registries/registries.py @@ -126,9 +126,7 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/registries/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}", + f"/cloud/v1/registries/{project_id}/{region_id}", body=maybe_transform( { "name": name, @@ -171,9 +169,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/registries/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}", + f"/cloud/v1/registries/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -211,9 +207,7 @@ def delete( region_id = self._client._get_cloud_region_id_path_param() extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -250,9 +244,7 @@ def get( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -292,9 +284,7 @@ def resize( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._patch( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/resize" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/resize", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/resize", body=maybe_transform({"storage_limit": storage_limit}, registry_resize_params.RegistryResizeParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -375,9 +365,7 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/registries/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}", + f"/cloud/v1/registries/{project_id}/{region_id}", body=await async_maybe_transform( { "name": name, @@ -420,9 +408,7 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/registries/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}", + f"/cloud/v1/registries/{project_id}/{region_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -460,9 +446,7 @@ async def delete( region_id = self._client._get_cloud_region_id_path_param() extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -499,9 +483,7 @@ async def get( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -541,9 +523,7 @@ async def resize( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._patch( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/resize" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/resize", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/resize", body=await async_maybe_transform( {"storage_limit": storage_limit}, registry_resize_params.RegistryResizeParams ), diff --git a/src/gcore/resources/cloud/registries/repositories.py b/src/gcore/resources/cloud/registries/repositories.py index 452755d2..74377052 100644 --- a/src/gcore/resources/cloud/registries/repositories.py +++ b/src/gcore/resources/cloud/registries/repositories.py @@ -69,9 +69,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -112,9 +110,7 @@ def delete( raise ValueError(f"Expected a non-empty value for `repository_name` but received {repository_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -172,9 +168,7 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -215,9 +209,7 @@ async def delete( raise ValueError(f"Expected a non-empty value for `repository_name` but received {repository_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/registries/tags.py b/src/gcore/resources/cloud/registries/tags.py index 7bed1478..ab35828c 100644 --- a/src/gcore/resources/cloud/registries/tags.py +++ b/src/gcore/resources/cloud/registries/tags.py @@ -78,9 +78,7 @@ def delete( raise ValueError(f"Expected a non-empty value for `tag_name` but received {tag_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts/{digest}/tags/{tag_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts/{digest}/tags/{tag_name}", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts/{digest}/tags/{tag_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -148,9 +146,7 @@ async def delete( raise ValueError(f"Expected a non-empty value for `tag_name` but received {tag_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts/{digest}/tags/{tag_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts/{digest}/tags/{tag_name}", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/repositories/{repository_name}/artifacts/{digest}/tags/{tag_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/registries/users.py b/src/gcore/resources/cloud/registries/users.py index 8c402baf..f535c7dd 100644 --- a/src/gcore/resources/cloud/registries/users.py +++ b/src/gcore/resources/cloud/registries/users.py @@ -89,9 +89,7 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users", body=maybe_transform( { "duration": duration, @@ -144,9 +142,7 @@ def update( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._patch( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}", body=maybe_transform( { "duration": duration, @@ -190,9 +186,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -231,9 +225,7 @@ def delete( region_id = self._client._get_cloud_region_id_path_param() extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -273,9 +265,7 @@ def create_multiple( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/batch" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/batch", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/batch", body=maybe_transform({"users": users}, user_create_multiple_params.UserCreateMultipleParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -314,9 +304,7 @@ def refresh_secret( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}/refresh_secret" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}/refresh_secret", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}/refresh_secret", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -387,9 +375,7 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users", body=await async_maybe_transform( { "duration": duration, @@ -442,9 +428,7 @@ async def update( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._patch( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}", body=await async_maybe_transform( { "duration": duration, @@ -488,9 +472,7 @@ async def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._get( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -529,9 +511,7 @@ async def delete( region_id = self._client._get_cloud_region_id_path_param() extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -571,9 +551,7 @@ async def create_multiple( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/batch" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/batch", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/batch", body=await async_maybe_transform({"users": users}, user_create_multiple_params.UserCreateMultipleParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -612,9 +590,7 @@ async def refresh_secret( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}/refresh_secret" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}/refresh_secret", + f"/cloud/v1/registries/{project_id}/{region_id}/{registry_id}/users/{user_id}/refresh_secret", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/reserved_fixed_ips/reserved_fixed_ips.py b/src/gcore/resources/cloud/reserved_fixed_ips/reserved_fixed_ips.py index e8714211..5acd6b62 100644 --- a/src/gcore/resources/cloud/reserved_fixed_ips/reserved_fixed_ips.py +++ b/src/gcore/resources/cloud/reserved_fixed_ips/reserved_fixed_ips.py @@ -274,9 +274,7 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}", body=maybe_transform( { "type": type, @@ -354,9 +352,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}", page=SyncOffsetPage[ReservedFixedIP], options=make_request_options( extra_headers=extra_headers, @@ -413,9 +409,7 @@ def delete( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return self._delete( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -454,9 +448,7 @@ def get( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return self._get( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -995,9 +987,7 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}", body=await async_maybe_transform( { "type": type, @@ -1075,9 +1065,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}", page=AsyncOffsetPage[ReservedFixedIP], options=make_request_options( extra_headers=extra_headers, @@ -1134,9 +1122,7 @@ async def delete( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return await self._delete( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1175,9 +1161,7 @@ async def get( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return await self._get( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/reserved_fixed_ips/vip.py b/src/gcore/resources/cloud/reserved_fixed_ips/vip.py index 22757eba..1d6c76e2 100644 --- a/src/gcore/resources/cloud/reserved_fixed_ips/vip.py +++ b/src/gcore/resources/cloud/reserved_fixed_ips/vip.py @@ -79,9 +79,7 @@ def list_candidate_ports( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return self._get( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/available_devices" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/available_devices", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/available_devices", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -120,9 +118,7 @@ def list_connected_ports( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return self._get( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -164,9 +160,7 @@ def replace_connected_ports( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return self._put( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices", body=maybe_transform( {"port_ids": port_ids}, vip_replace_connected_ports_params.VipReplaceConnectedPortsParams ), @@ -211,9 +205,7 @@ def toggle( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return self._patch( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}", body=maybe_transform({"is_vip": is_vip}, vip_toggle_params.VipToggleParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -256,9 +248,7 @@ def update_connected_ports( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return self._patch( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices", body=maybe_transform( {"port_ids": port_ids}, vip_update_connected_ports_params.VipUpdateConnectedPortsParams ), @@ -321,9 +311,7 @@ async def list_candidate_ports( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return await self._get( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/available_devices" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/available_devices", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/available_devices", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -362,9 +350,7 @@ async def list_connected_ports( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return await self._get( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -406,9 +392,7 @@ async def replace_connected_ports( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return await self._put( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices", body=await async_maybe_transform( {"port_ids": port_ids}, vip_replace_connected_ports_params.VipReplaceConnectedPortsParams ), @@ -453,9 +437,7 @@ async def toggle( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return await self._patch( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}", body=await async_maybe_transform({"is_vip": is_vip}, vip_toggle_params.VipToggleParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -498,9 +480,7 @@ async def update_connected_ports( if not port_id: raise ValueError(f"Expected a non-empty value for `port_id` but received {port_id!r}") return await self._patch( - f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices", + f"/cloud/v1/reserved_fixed_ips/{project_id}/{region_id}/{port_id}/connected_devices", body=await async_maybe_transform( {"port_ids": port_ids}, vip_update_connected_ports_params.VipUpdateConnectedPortsParams ), diff --git a/src/gcore/resources/cloud/secrets.py b/src/gcore/resources/cloud/secrets.py index 962ea5eb..b1c6a224 100644 --- a/src/gcore/resources/cloud/secrets.py +++ b/src/gcore/resources/cloud/secrets.py @@ -86,9 +86,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/secrets/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/secrets/{project_id}/{region_id}", + f"/cloud/v1/secrets/{project_id}/{region_id}", page=SyncOffsetPage[Secret], options=make_request_options( extra_headers=extra_headers, @@ -144,9 +142,7 @@ def delete( if not secret_id: raise ValueError(f"Expected a non-empty value for `secret_id` but received {secret_id!r}") return self._delete( - f"/cloud/v1/secrets/{project_id}/{region_id}/{secret_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/secrets/{project_id}/{region_id}/{secret_id}", + f"/cloud/v1/secrets/{project_id}/{region_id}/{secret_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -191,9 +187,7 @@ def get( if not secret_id: raise ValueError(f"Expected a non-empty value for `secret_id` but received {secret_id!r}") return self._get( - f"/cloud/v1/secrets/{project_id}/{region_id}/{secret_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/secrets/{project_id}/{region_id}/{secret_id}", + f"/cloud/v1/secrets/{project_id}/{region_id}/{secret_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -242,9 +236,7 @@ def upload_tls_certificate( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v2/secrets/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/secrets/{project_id}/{region_id}", + f"/cloud/v2/secrets/{project_id}/{region_id}", body=maybe_transform( { "name": name, @@ -361,9 +353,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/secrets/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/secrets/{project_id}/{region_id}", + f"/cloud/v1/secrets/{project_id}/{region_id}", page=AsyncOffsetPage[Secret], options=make_request_options( extra_headers=extra_headers, @@ -419,9 +409,7 @@ async def delete( if not secret_id: raise ValueError(f"Expected a non-empty value for `secret_id` but received {secret_id!r}") return await self._delete( - f"/cloud/v1/secrets/{project_id}/{region_id}/{secret_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/secrets/{project_id}/{region_id}/{secret_id}", + f"/cloud/v1/secrets/{project_id}/{region_id}/{secret_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -466,9 +454,7 @@ async def get( if not secret_id: raise ValueError(f"Expected a non-empty value for `secret_id` but received {secret_id!r}") return await self._get( - f"/cloud/v1/secrets/{project_id}/{region_id}/{secret_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/secrets/{project_id}/{region_id}/{secret_id}", + f"/cloud/v1/secrets/{project_id}/{region_id}/{secret_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -517,9 +503,7 @@ async def upload_tls_certificate( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v2/secrets/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v2/secrets/{project_id}/{region_id}", + f"/cloud/v2/secrets/{project_id}/{region_id}", body=await async_maybe_transform( { "name": name, diff --git a/src/gcore/resources/cloud/security_groups/rules.py b/src/gcore/resources/cloud/security_groups/rules.py index c69d2608..89b27a23 100644 --- a/src/gcore/resources/cloud/security_groups/rules.py +++ b/src/gcore/resources/cloud/security_groups/rules.py @@ -126,9 +126,7 @@ def create( if not group_id: raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") return self._post( - f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/rules" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/rules", + f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/rules", body=maybe_transform( { "description": description, @@ -181,9 +179,7 @@ def delete( raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v1/securitygrouprules/{project_id}/{region_id}/{rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/securitygrouprules/{project_id}/{region_id}/{rule_id}", + f"/cloud/v1/securitygrouprules/{project_id}/{region_id}/{rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -277,9 +273,7 @@ def replace( if not rule_id: raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}") return self._put( - f"/cloud/v1/securitygrouprules/{project_id}/{region_id}/{rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/securitygrouprules/{project_id}/{region_id}/{rule_id}", + f"/cloud/v1/securitygrouprules/{project_id}/{region_id}/{rule_id}", body=maybe_transform( { "direction": direction, @@ -403,9 +397,7 @@ async def create( if not group_id: raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") return await self._post( - f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/rules" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/rules", + f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/rules", body=await async_maybe_transform( { "description": description, @@ -458,9 +450,7 @@ async def delete( raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v1/securitygrouprules/{project_id}/{region_id}/{rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/securitygrouprules/{project_id}/{region_id}/{rule_id}", + f"/cloud/v1/securitygrouprules/{project_id}/{region_id}/{rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -554,9 +544,7 @@ async def replace( if not rule_id: raise ValueError(f"Expected a non-empty value for `rule_id` but received {rule_id!r}") return await self._put( - f"/cloud/v1/securitygrouprules/{project_id}/{region_id}/{rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/securitygrouprules/{project_id}/{region_id}/{rule_id}", + f"/cloud/v1/securitygrouprules/{project_id}/{region_id}/{rule_id}", body=await async_maybe_transform( { "direction": direction, diff --git a/src/gcore/resources/cloud/security_groups/security_groups.py b/src/gcore/resources/cloud/security_groups/security_groups.py index 0e24383b..ac4d9bc3 100644 --- a/src/gcore/resources/cloud/security_groups/security_groups.py +++ b/src/gcore/resources/cloud/security_groups/security_groups.py @@ -97,9 +97,7 @@ def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._post( - f"/cloud/v1/securitygroups/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}", + f"/cloud/v1/securitygroups/{project_id}/{region_id}", body=maybe_transform( { "security_group": security_group, @@ -172,9 +170,7 @@ def update( if not group_id: raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") return self._patch( - f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}", + f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}", body=maybe_transform( { "changed_rules": changed_rules, @@ -230,9 +226,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/securitygroups/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}", + f"/cloud/v1/securitygroups/{project_id}/{region_id}", page=SyncOffsetPage[SecurityGroup], options=make_request_options( extra_headers=extra_headers, @@ -285,9 +279,7 @@ def delete( raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}", + f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -329,9 +321,7 @@ def copy( if not group_id: raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") return self._post( - f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/copy" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/copy", + f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/copy", body=maybe_transform({"name": name}, security_group_copy_params.SecurityGroupCopyParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -371,9 +361,7 @@ def get( if not group_id: raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") return self._get( - f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}", + f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -412,9 +400,7 @@ def revert_to_default( if not group_id: raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") return self._post( - f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/revert" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/revert", + f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/revert", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -481,9 +467,7 @@ async def create( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return await self._post( - f"/cloud/v1/securitygroups/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}", + f"/cloud/v1/securitygroups/{project_id}/{region_id}", body=await async_maybe_transform( { "security_group": security_group, @@ -556,9 +540,7 @@ async def update( if not group_id: raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") return await self._patch( - f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}", + f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}", body=await async_maybe_transform( { "changed_rules": changed_rules, @@ -614,9 +596,7 @@ def list( if region_id is None: region_id = self._client._get_cloud_region_id_path_param() return self._get_api_list( - f"/cloud/v1/securitygroups/{project_id}/{region_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}", + f"/cloud/v1/securitygroups/{project_id}/{region_id}", page=AsyncOffsetPage[SecurityGroup], options=make_request_options( extra_headers=extra_headers, @@ -669,9 +649,7 @@ async def delete( raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}", + f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -713,9 +691,7 @@ async def copy( if not group_id: raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") return await self._post( - f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/copy" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/copy", + f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/copy", body=await async_maybe_transform({"name": name}, security_group_copy_params.SecurityGroupCopyParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -755,9 +731,7 @@ async def get( if not group_id: raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") return await self._get( - f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}", + f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -796,9 +770,7 @@ async def revert_to_default( if not group_id: raise ValueError(f"Expected a non-empty value for `group_id` but received {group_id!r}") return await self._post( - f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/revert" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/revert", + f"/cloud/v1/securitygroups/{project_id}/{region_id}/{group_id}/revert", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/ssh_keys.py b/src/gcore/resources/cloud/ssh_keys.py index 30ef2830..788d415c 100644 --- a/src/gcore/resources/cloud/ssh_keys.py +++ b/src/gcore/resources/cloud/ssh_keys.py @@ -90,9 +90,7 @@ def create( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._post( - f"/cloud/v1/ssh_keys/{project_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ssh_keys/{project_id}", + f"/cloud/v1/ssh_keys/{project_id}", body=maybe_transform( { "name": name, @@ -143,9 +141,7 @@ def update( if not ssh_key_id: raise ValueError(f"Expected a non-empty value for `ssh_key_id` but received {ssh_key_id!r}") return self._patch( - f"/cloud/v1/ssh_keys/{project_id}/{ssh_key_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ssh_keys/{project_id}/{ssh_key_id}", + f"/cloud/v1/ssh_keys/{project_id}/{ssh_key_id}", body=maybe_transform({"shared_in_project": shared_in_project}, ssh_key_update_params.SSHKeyUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -190,9 +186,7 @@ def list( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._get_api_list( - f"/cloud/v1/ssh_keys/{project_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ssh_keys/{project_id}", + f"/cloud/v1/ssh_keys/{project_id}", page=SyncOffsetPage[SSHKey], options=make_request_options( extra_headers=extra_headers, @@ -245,9 +239,7 @@ def delete( raise ValueError(f"Expected a non-empty value for `ssh_key_id` but received {ssh_key_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/cloud/v1/ssh_keys/{project_id}/{ssh_key_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ssh_keys/{project_id}/{ssh_key_id}", + f"/cloud/v1/ssh_keys/{project_id}/{ssh_key_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -287,9 +279,7 @@ def get( if not ssh_key_id: raise ValueError(f"Expected a non-empty value for `ssh_key_id` but received {ssh_key_id!r}") return self._get( - f"/cloud/v1/ssh_keys/{project_id}/{ssh_key_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ssh_keys/{project_id}/{ssh_key_id}", + f"/cloud/v1/ssh_keys/{project_id}/{ssh_key_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -362,9 +352,7 @@ async def create( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return await self._post( - f"/cloud/v1/ssh_keys/{project_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ssh_keys/{project_id}", + f"/cloud/v1/ssh_keys/{project_id}", body=await async_maybe_transform( { "name": name, @@ -415,9 +403,7 @@ async def update( if not ssh_key_id: raise ValueError(f"Expected a non-empty value for `ssh_key_id` but received {ssh_key_id!r}") return await self._patch( - f"/cloud/v1/ssh_keys/{project_id}/{ssh_key_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ssh_keys/{project_id}/{ssh_key_id}", + f"/cloud/v1/ssh_keys/{project_id}/{ssh_key_id}", body=await async_maybe_transform( {"shared_in_project": shared_in_project}, ssh_key_update_params.SSHKeyUpdateParams ), @@ -464,9 +450,7 @@ def list( if project_id is None: project_id = self._client._get_cloud_project_id_path_param() return self._get_api_list( - f"/cloud/v1/ssh_keys/{project_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ssh_keys/{project_id}", + f"/cloud/v1/ssh_keys/{project_id}", page=AsyncOffsetPage[SSHKey], options=make_request_options( extra_headers=extra_headers, @@ -519,9 +503,7 @@ async def delete( raise ValueError(f"Expected a non-empty value for `ssh_key_id` but received {ssh_key_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/cloud/v1/ssh_keys/{project_id}/{ssh_key_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ssh_keys/{project_id}/{ssh_key_id}", + f"/cloud/v1/ssh_keys/{project_id}/{ssh_key_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -561,9 +543,7 @@ async def get( if not ssh_key_id: raise ValueError(f"Expected a non-empty value for `ssh_key_id` but received {ssh_key_id!r}") return await self._get( - f"/cloud/v1/ssh_keys/{project_id}/{ssh_key_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/ssh_keys/{project_id}/{ssh_key_id}", + f"/cloud/v1/ssh_keys/{project_id}/{ssh_key_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/tasks.py b/src/gcore/resources/cloud/tasks.py index b52d711c..2fbc8d91 100644 --- a/src/gcore/resources/cloud/tasks.py +++ b/src/gcore/resources/cloud/tasks.py @@ -194,7 +194,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v1/tasks" if self._client._base_url_overridden else "https://api.gcore.com//cloud/v1/tasks", + "/cloud/v1/tasks", page=SyncOffsetPage[Task], options=make_request_options( extra_headers=extra_headers, @@ -251,9 +251,7 @@ def acknowledge_all( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - "/cloud/v1/tasks/acknowledge_all" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v1/tasks/acknowledge_all", + "/cloud/v1/tasks/acknowledge_all", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -298,9 +296,7 @@ def acknowledge_one( if not task_id: raise ValueError(f"Expected a non-empty value for `task_id` but received {task_id!r}") return self._post( - f"/cloud/v1/tasks/{task_id}/acknowledge" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/tasks/{task_id}/acknowledge", + f"/cloud/v1/tasks/{task_id}/acknowledge", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -335,9 +331,7 @@ def get( if not task_id: raise ValueError(f"Expected a non-empty value for `task_id` but received {task_id!r}") return self._get( - f"/cloud/v1/tasks/{task_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/tasks/{task_id}", + f"/cloud/v1/tasks/{task_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -509,7 +503,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v1/tasks" if self._client._base_url_overridden else "https://api.gcore.com//cloud/v1/tasks", + "/cloud/v1/tasks", page=AsyncOffsetPage[Task], options=make_request_options( extra_headers=extra_headers, @@ -566,9 +560,7 @@ async def acknowledge_all( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - "/cloud/v1/tasks/acknowledge_all" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v1/tasks/acknowledge_all", + "/cloud/v1/tasks/acknowledge_all", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -613,9 +605,7 @@ async def acknowledge_one( if not task_id: raise ValueError(f"Expected a non-empty value for `task_id` but received {task_id!r}") return await self._post( - f"/cloud/v1/tasks/{task_id}/acknowledge" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/tasks/{task_id}/acknowledge", + f"/cloud/v1/tasks/{task_id}/acknowledge", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -650,9 +640,7 @@ async def get( if not task_id: raise ValueError(f"Expected a non-empty value for `task_id` but received {task_id!r}") return await self._get( - f"/cloud/v1/tasks/{task_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/tasks/{task_id}", + f"/cloud/v1/tasks/{task_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/usage_reports.py b/src/gcore/resources/cloud/usage_reports.py index 48387eda..0adc0809 100644 --- a/src/gcore/resources/cloud/usage_reports.py +++ b/src/gcore/resources/cloud/usage_reports.py @@ -139,9 +139,7 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/cloud/v1/usage_report" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v1/usage_report", + "/cloud/v1/usage_report", body=maybe_transform( { "time_from": time_from, @@ -279,9 +277,7 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/cloud/v1/usage_report" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v1/usage_report", + "/cloud/v1/usage_report", body=await async_maybe_transform( { "time_from": time_from, diff --git a/src/gcore/resources/cloud/users/role_assignments.py b/src/gcore/resources/cloud/users/role_assignments.py index 0318b8fc..5294d3a7 100644 --- a/src/gcore/resources/cloud/users/role_assignments.py +++ b/src/gcore/resources/cloud/users/role_assignments.py @@ -85,9 +85,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/cloud/v1/users/assignments" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v1/users/assignments", + "/cloud/v1/users/assignments", body=maybe_transform( { "role": role, @@ -141,9 +139,7 @@ def update( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/cloud/v1/users/assignments/{assignment_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/users/assignments/{assignment_id}", + f"/cloud/v1/users/assignments/{assignment_id}", body=maybe_transform( { "role": role, @@ -195,9 +191,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v1/users/assignments" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v1/users/assignments", + "/cloud/v1/users/assignments", page=SyncOffsetPage[RoleAssignment], options=make_request_options( extra_headers=extra_headers, @@ -243,9 +237,7 @@ def delete( timeout: Override the client-level default timeout for this request, in seconds """ return self._delete( - f"/cloud/v1/users/assignments/{assignment_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/users/assignments/{assignment_id}", + f"/cloud/v1/users/assignments/{assignment_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -308,9 +300,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/cloud/v1/users/assignments" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v1/users/assignments", + "/cloud/v1/users/assignments", body=await async_maybe_transform( { "role": role, @@ -364,9 +354,7 @@ async def update( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/cloud/v1/users/assignments/{assignment_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/users/assignments/{assignment_id}", + f"/cloud/v1/users/assignments/{assignment_id}", body=await async_maybe_transform( { "role": role, @@ -418,9 +406,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/cloud/v1/users/assignments" - if self._client._base_url_overridden - else "https://api.gcore.com//cloud/v1/users/assignments", + "/cloud/v1/users/assignments", page=AsyncOffsetPage[RoleAssignment], options=make_request_options( extra_headers=extra_headers, @@ -466,9 +452,7 @@ async def delete( timeout: Override the client-level default timeout for this request, in seconds """ return await self._delete( - f"/cloud/v1/users/assignments/{assignment_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//cloud/v1/users/assignments/{assignment_id}", + f"/cloud/v1/users/assignments/{assignment_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/cloud/volumes.py b/src/gcore/resources/cloud/volumes.py index 3758fe11..60784300 100644 --- a/src/gcore/resources/cloud/volumes.py +++ b/src/gcore/resources/cloud/volumes.py @@ -292,9 +292,7 @@ def create( 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, @@ -378,9 +376,7 @@ def update( 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, @@ -462,9 +458,7 @@ def list( 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, @@ -533,9 +527,7 @@ def delete( 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, @@ -592,9 +584,7 @@ def attach_to_instance( 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, @@ -651,9 +641,7 @@ def change_type( 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 @@ -702,9 +690,7 @@ def detach_from_instance( 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 ), @@ -752,9 +738,7 @@ def get( 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 ), @@ -804,9 +788,7 @@ def resize( 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 @@ -855,9 +837,7 @@ def revert_to_last_snapshot( 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 ), @@ -1542,9 +1522,7 @@ async def create( 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, @@ -1628,9 +1606,7 @@ async def update( 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, @@ -1712,9 +1688,7 @@ def list( 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, @@ -1783,9 +1757,7 @@ async def delete( 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, @@ -1842,9 +1814,7 @@ async def attach_to_instance( 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, @@ -1901,9 +1871,7 @@ async def change_type( 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 ), @@ -1954,9 +1922,7 @@ async def detach_from_instance( 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 ), @@ -2004,9 +1970,7 @@ async def get( 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 ), @@ -2056,9 +2020,7 @@ async def resize( 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 @@ -2107,9 +2069,7 @@ async def revert_to_last_snapshot( 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 ), diff --git a/src/gcore/resources/dns/dns.py b/src/gcore/resources/dns/dns.py index 612cd629..3e6485d0 100644 --- a/src/gcore/resources/dns/dns.py +++ b/src/gcore/resources/dns/dns.py @@ -104,9 +104,7 @@ def get_account_overview( ) -> 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 @@ def lookup( 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 @@ async def get_account_overview( ) -> 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 @@ async def lookup( 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, diff --git a/src/gcore/resources/dns/locations.py b/src/gcore/resources/dns/locations.py index c58907a8..20dcea5a 100644 --- a/src/gcore/resources/dns/locations.py +++ b/src/gcore/resources/dns/locations.py @@ -54,7 +54,7 @@ def list( ) -> 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 @@ def list_continents( ) -> 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 @@ def list_countries( ) -> 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 @@ def list_regions( ) -> 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 @@ async def list( ) -> 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 @@ async def list_continents( ) -> 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 @@ async def list_countries( ) -> 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 @@ async def list_regions( ) -> 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 ), diff --git a/src/gcore/resources/dns/metrics.py b/src/gcore/resources/dns/metrics.py index b9bf45a5..8eef7aeb 100644 --- a/src/gcore/resources/dns/metrics.py +++ b/src/gcore/resources/dns/metrics.py @@ -82,9 +82,7 @@ def list( """ 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 @@ async def list( """ 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, diff --git a/src/gcore/resources/dns/pickers/pickers.py b/src/gcore/resources/dns/pickers/pickers.py index 599a2450..3078c7f2 100644 --- a/src/gcore/resources/dns/pickers/pickers.py +++ b/src/gcore/resources/dns/pickers/pickers.py @@ -63,7 +63,7 @@ def list( ) -> 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 @@ async def list( ) -> 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 ), diff --git a/src/gcore/resources/dns/pickers/presets.py b/src/gcore/resources/dns/pickers/presets.py index 09f7d53b..aebd10ff 100644 --- a/src/gcore/resources/dns/pickers/presets.py +++ b/src/gcore/resources/dns/pickers/presets.py @@ -51,9 +51,7 @@ def list( ) -> 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 @@ async def list( ) -> 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 ), diff --git a/src/gcore/resources/dns/zones/dnssec.py b/src/gcore/resources/dns/zones/dnssec.py index 8f283155..8c747071 100644 --- a/src/gcore/resources/dns/zones/dnssec.py +++ b/src/gcore/resources/dns/zones/dnssec.py @@ -69,9 +69,7 @@ def update( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return self._patch( - f"/dns/v2/zones/{name}/dnssec" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{name}/dnssec", + f"/dns/v2/zones/{name}/dnssec", body=maybe_transform({"enabled": enabled}, dnssec_update_params.DnssecUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -105,9 +103,7 @@ def get( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return self._get( - f"/dns/v2/zones/{name}/dnssec" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{name}/dnssec", + f"/dns/v2/zones/{name}/dnssec", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -162,9 +158,7 @@ async def update( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return await self._patch( - f"/dns/v2/zones/{name}/dnssec" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{name}/dnssec", + f"/dns/v2/zones/{name}/dnssec", body=await async_maybe_transform({"enabled": enabled}, dnssec_update_params.DnssecUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -198,9 +192,7 @@ async def get( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return await self._get( - f"/dns/v2/zones/{name}/dnssec" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{name}/dnssec", + f"/dns/v2/zones/{name}/dnssec", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/dns/zones/rrsets.py b/src/gcore/resources/dns/zones/rrsets.py index 93697456..e1d136b1 100644 --- a/src/gcore/resources/dns/zones/rrsets.py +++ b/src/gcore/resources/dns/zones/rrsets.py @@ -205,9 +205,7 @@ def create( if not rrset_type: raise ValueError(f"Expected a non-empty value for `rrset_type` but received {rrset_type!r}") return self._post( - f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", + f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", body=maybe_transform( { "resource_records": resource_records, @@ -261,9 +259,7 @@ def list( if not zone_name: raise ValueError(f"Expected a non-empty value for `zone_name` but received {zone_name!r}") return self._get( - f"/dns/v2/zones/{zone_name}/rrsets" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{zone_name}/rrsets", + f"/dns/v2/zones/{zone_name}/rrsets", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -314,9 +310,7 @@ def delete( if not rrset_type: raise ValueError(f"Expected a non-empty value for `rrset_type` but received {rrset_type!r}") return self._delete( - f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", + f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -355,9 +349,7 @@ def get( if not rrset_type: raise ValueError(f"Expected a non-empty value for `rrset_type` but received {rrset_type!r}") return self._get( - f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", + f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -402,9 +394,7 @@ def get_failover_logs( if not rrset_type: raise ValueError(f"Expected a non-empty value for `rrset_type` but received {rrset_type!r}") return self._get( - f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}/failover/log" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}/failover/log", + f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}/failover/log", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -463,9 +453,7 @@ def replace( if not rrset_type: raise ValueError(f"Expected a non-empty value for `rrset_type` but received {rrset_type!r}") return self._put( - f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", + f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", body=maybe_transform( { "resource_records": resource_records, @@ -656,9 +644,7 @@ async def create( if not rrset_type: raise ValueError(f"Expected a non-empty value for `rrset_type` but received {rrset_type!r}") return await self._post( - f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", + f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", body=await async_maybe_transform( { "resource_records": resource_records, @@ -712,9 +698,7 @@ async def list( if not zone_name: raise ValueError(f"Expected a non-empty value for `zone_name` but received {zone_name!r}") return await self._get( - f"/dns/v2/zones/{zone_name}/rrsets" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{zone_name}/rrsets", + f"/dns/v2/zones/{zone_name}/rrsets", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -765,9 +749,7 @@ async def delete( if not rrset_type: raise ValueError(f"Expected a non-empty value for `rrset_type` but received {rrset_type!r}") return await self._delete( - f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", + f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -806,9 +788,7 @@ async def get( if not rrset_type: raise ValueError(f"Expected a non-empty value for `rrset_type` but received {rrset_type!r}") return await self._get( - f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", + f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -853,9 +833,7 @@ async def get_failover_logs( if not rrset_type: raise ValueError(f"Expected a non-empty value for `rrset_type` but received {rrset_type!r}") return await self._get( - f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}/failover/log" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}/failover/log", + f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}/failover/log", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -914,9 +892,7 @@ async def replace( if not rrset_type: raise ValueError(f"Expected a non-empty value for `rrset_type` but received {rrset_type!r}") return await self._put( - f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", + f"/dns/v2/zones/{zone_name}/{rrset_name}/{rrset_type}", body=await async_maybe_transform( { "resource_records": resource_records, diff --git a/src/gcore/resources/dns/zones/zones.py b/src/gcore/resources/dns/zones/zones.py index 31b815a3..75e11dde 100644 --- a/src/gcore/resources/dns/zones/zones.py +++ b/src/gcore/resources/dns/zones/zones.py @@ -143,7 +143,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/dns/v2/zones" if self._client._base_url_overridden else "https://api.gcore.com//dns/v2/zones", + "/dns/v2/zones", body=maybe_transform( { "name": name, @@ -225,7 +225,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/dns/v2/zones" if self._client._base_url_overridden else "https://api.gcore.com//dns/v2/zones", + "/dns/v2/zones", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -283,9 +283,7 @@ def delete( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return self._delete( - f"/dns/v2/zones/{name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{name}", + f"/dns/v2/zones/{name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -320,9 +318,7 @@ def check_delegation_status( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return self._post( - f"/dns/v2/analyze/{name}/delegation-status" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/analyze/{name}/delegation-status", + f"/dns/v2/analyze/{name}/delegation-status", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -355,9 +351,7 @@ def disable( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return self._patch( - f"/dns/v2/zones/{name}/disable" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{name}/disable", + f"/dns/v2/zones/{name}/disable", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -390,9 +384,7 @@ def enable( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return self._patch( - f"/dns/v2/zones/{name}/enable" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{name}/enable", + f"/dns/v2/zones/{name}/enable", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -425,9 +417,7 @@ def export( if not zone_name: raise ValueError(f"Expected a non-empty value for `zone_name` but received {zone_name!r}") return self._get( - f"/dns/v2/zones/{zone_name}/export" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{zone_name}/export", + f"/dns/v2/zones/{zone_name}/export", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -460,9 +450,7 @@ def get( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return self._get( - f"/dns/v2/zones/{name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{name}", + f"/dns/v2/zones/{name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -529,9 +517,7 @@ def get_statistics( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return self._get( - f"/dns/v2/zones/{name}/statistics" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{name}/statistics", + f"/dns/v2/zones/{name}/statistics", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -597,9 +583,7 @@ def import_( if not zone_name: raise ValueError(f"Expected a non-empty value for `zone_name` but received {zone_name!r}") return self._post( - f"/dns/v2/zones/{zone_name}/import" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{zone_name}/import", + f"/dns/v2/zones/{zone_name}/import", body=maybe_transform(body, zone_import_params.ZoneImportParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -672,9 +656,7 @@ def replace( if not path_name: raise ValueError(f"Expected a non-empty value for `path_name` but received {path_name!r}") return self._put( - f"/dns/v2/zones/{path_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{path_name}", + f"/dns/v2/zones/{path_name}", body=maybe_transform( { "body_name": body_name, @@ -787,7 +769,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/dns/v2/zones" if self._client._base_url_overridden else "https://api.gcore.com//dns/v2/zones", + "/dns/v2/zones", body=await async_maybe_transform( { "name": name, @@ -869,7 +851,7 @@ async def list( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/dns/v2/zones" if self._client._base_url_overridden else "https://api.gcore.com//dns/v2/zones", + "/dns/v2/zones", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -927,9 +909,7 @@ async def delete( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return await self._delete( - f"/dns/v2/zones/{name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{name}", + f"/dns/v2/zones/{name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -964,9 +944,7 @@ async def check_delegation_status( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return await self._post( - f"/dns/v2/analyze/{name}/delegation-status" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/analyze/{name}/delegation-status", + f"/dns/v2/analyze/{name}/delegation-status", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -999,9 +977,7 @@ async def disable( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return await self._patch( - f"/dns/v2/zones/{name}/disable" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{name}/disable", + f"/dns/v2/zones/{name}/disable", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1034,9 +1010,7 @@ async def enable( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return await self._patch( - f"/dns/v2/zones/{name}/enable" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{name}/enable", + f"/dns/v2/zones/{name}/enable", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1069,9 +1043,7 @@ async def export( if not zone_name: raise ValueError(f"Expected a non-empty value for `zone_name` but received {zone_name!r}") return await self._get( - f"/dns/v2/zones/{zone_name}/export" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{zone_name}/export", + f"/dns/v2/zones/{zone_name}/export", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1104,9 +1076,7 @@ async def get( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return await self._get( - f"/dns/v2/zones/{name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{name}", + f"/dns/v2/zones/{name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1173,9 +1143,7 @@ async def get_statistics( if not name: raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") return await self._get( - f"/dns/v2/zones/{name}/statistics" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{name}/statistics", + f"/dns/v2/zones/{name}/statistics", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1241,9 +1209,7 @@ async def import_( if not zone_name: raise ValueError(f"Expected a non-empty value for `zone_name` but received {zone_name!r}") return await self._post( - f"/dns/v2/zones/{zone_name}/import" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{zone_name}/import", + f"/dns/v2/zones/{zone_name}/import", body=await async_maybe_transform(body, zone_import_params.ZoneImportParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -1316,9 +1282,7 @@ async def replace( if not path_name: raise ValueError(f"Expected a non-empty value for `path_name` but received {path_name!r}") return await self._put( - f"/dns/v2/zones/{path_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//dns/v2/zones/{path_name}", + f"/dns/v2/zones/{path_name}", body=await async_maybe_transform( { "body_name": body_name, diff --git a/src/gcore/resources/fastedge/apps/apps.py b/src/gcore/resources/fastedge/apps/apps.py index a72cd50f..92d2662a 100644 --- a/src/gcore/resources/fastedge/apps/apps.py +++ b/src/gcore/resources/fastedge/apps/apps.py @@ -121,7 +121,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/fastedge/v1/apps" if self._client._base_url_overridden else "https://api.gcore.com//fastedge/v1/apps", + "/fastedge/v1/apps", body=maybe_transform( { "binary": binary, @@ -208,9 +208,7 @@ def update( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/fastedge/v1/apps/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/apps/{id}", + f"/fastedge/v1/apps/{id}", body=maybe_transform( { "binary": binary, @@ -307,7 +305,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/fastedge/v1/apps" if self._client._base_url_overridden else "https://api.gcore.com//fastedge/v1/apps", + "/fastedge/v1/apps", page=SyncOffsetPageFastedgeApps[AppShort], options=make_request_options( extra_headers=extra_headers, @@ -357,9 +355,7 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/fastedge/v1/apps/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/apps/{id}", + f"/fastedge/v1/apps/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -390,9 +386,7 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/fastedge/v1/apps/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/apps/{id}", + f"/fastedge/v1/apps/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -424,9 +418,7 @@ def replace( timeout: Override the client-level default timeout for this request, in seconds """ return self._put( - f"/fastedge/v1/apps/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/apps/{id}", + f"/fastedge/v1/apps/{id}", body=maybe_transform(body, app_replace_params.AppReplaceParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -522,7 +514,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/fastedge/v1/apps" if self._client._base_url_overridden else "https://api.gcore.com//fastedge/v1/apps", + "/fastedge/v1/apps", body=await async_maybe_transform( { "binary": binary, @@ -609,9 +601,7 @@ async def update( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/fastedge/v1/apps/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/apps/{id}", + f"/fastedge/v1/apps/{id}", body=await async_maybe_transform( { "binary": binary, @@ -708,7 +698,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/fastedge/v1/apps" if self._client._base_url_overridden else "https://api.gcore.com//fastedge/v1/apps", + "/fastedge/v1/apps", page=AsyncOffsetPageFastedgeApps[AppShort], options=make_request_options( extra_headers=extra_headers, @@ -758,9 +748,7 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/fastedge/v1/apps/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/apps/{id}", + f"/fastedge/v1/apps/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -791,9 +779,7 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/fastedge/v1/apps/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/apps/{id}", + f"/fastedge/v1/apps/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -825,9 +811,7 @@ async def replace( timeout: Override the client-level default timeout for this request, in seconds """ return await self._put( - f"/fastedge/v1/apps/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/apps/{id}", + f"/fastedge/v1/apps/{id}", body=await async_maybe_transform(body, app_replace_params.AppReplaceParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout diff --git a/src/gcore/resources/fastedge/apps/logs.py b/src/gcore/resources/fastedge/apps/logs.py index b61bcfd9..f43d121c 100644 --- a/src/gcore/resources/fastedge/apps/logs.py +++ b/src/gcore/resources/fastedge/apps/logs.py @@ -94,9 +94,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/fastedge/v1/apps/{id}/logs" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/apps/{id}/logs", + f"/fastedge/v1/apps/{id}/logs", page=SyncOffsetPageFastedgeAppLogs[Log], options=make_request_options( extra_headers=extra_headers, @@ -189,9 +187,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/fastedge/v1/apps/{id}/logs" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/apps/{id}/logs", + f"/fastedge/v1/apps/{id}/logs", page=AsyncOffsetPageFastedgeAppLogs[Log], options=make_request_options( extra_headers=extra_headers, diff --git a/src/gcore/resources/fastedge/binaries.py b/src/gcore/resources/fastedge/binaries.py index bdda5fd9..8323efb1 100644 --- a/src/gcore/resources/fastedge/binaries.py +++ b/src/gcore/resources/fastedge/binaries.py @@ -67,9 +67,7 @@ def create( """ extra_headers = {"Content-Type": "application/octet-stream", **(extra_headers or {})} return self._post( - "/fastedge/v1/binaries/raw" - if self._client._base_url_overridden - else "https://api.gcore.com//fastedge/v1/binaries/raw", + "/fastedge/v1/binaries/raw", body=read_file_content(body), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -89,9 +87,7 @@ def list( ) -> BinaryListResponse: """List binaries""" return self._get( - "/fastedge/v1/binaries" - if self._client._base_url_overridden - else "https://api.gcore.com//fastedge/v1/binaries", + "/fastedge/v1/binaries", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -123,9 +119,7 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/fastedge/v1/binaries/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/binaries/{id}", + f"/fastedge/v1/binaries/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -156,9 +150,7 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/fastedge/v1/binaries/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/binaries/{id}", + f"/fastedge/v1/binaries/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -211,9 +203,7 @@ async def create( """ extra_headers = {"Content-Type": "application/octet-stream", **(extra_headers or {})} return await self._post( - "/fastedge/v1/binaries/raw" - if self._client._base_url_overridden - else "https://api.gcore.com//fastedge/v1/binaries/raw", + "/fastedge/v1/binaries/raw", body=await async_read_file_content(body), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -233,9 +223,7 @@ async def list( ) -> BinaryListResponse: """List binaries""" return await self._get( - "/fastedge/v1/binaries" - if self._client._base_url_overridden - else "https://api.gcore.com//fastedge/v1/binaries", + "/fastedge/v1/binaries", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -267,9 +255,7 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/fastedge/v1/binaries/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/binaries/{id}", + f"/fastedge/v1/binaries/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -300,9 +286,7 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/fastedge/v1/binaries/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/binaries/{id}", + f"/fastedge/v1/binaries/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/fastedge/fastedge.py b/src/gcore/resources/fastedge/fastedge.py index e52b5216..9b052788 100644 --- a/src/gcore/resources/fastedge/fastedge.py +++ b/src/gcore/resources/fastedge/fastedge.py @@ -123,7 +123,7 @@ def get_account_overview( ) -> Client: """Get status and limits for the client""" return self._get( - "/fastedge/v1/me" if self._client._base_url_overridden else "https://api.gcore.com//fastedge/v1/me", + "/fastedge/v1/me", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -187,7 +187,7 @@ async def get_account_overview( ) -> Client: """Get status and limits for the client""" return await self._get( - "/fastedge/v1/me" if self._client._base_url_overridden else "https://api.gcore.com//fastedge/v1/me", + "/fastedge/v1/me", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/fastedge/kv_stores.py b/src/gcore/resources/fastedge/kv_stores.py index 17cd738d..cb007bbc 100644 --- a/src/gcore/resources/fastedge/kv_stores.py +++ b/src/gcore/resources/fastedge/kv_stores.py @@ -72,7 +72,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/fastedge/v1/kv" if self._client._base_url_overridden else "https://api.gcore.com//fastedge/v1/kv", + "/fastedge/v1/kv", body=maybe_transform( { "byod": byod, @@ -112,7 +112,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/fastedge/v1/kv" if self._client._base_url_overridden else "https://api.gcore.com//fastedge/v1/kv", + "/fastedge/v1/kv", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -148,9 +148,7 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/fastedge/v1/kv/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/kv/{id}", + f"/fastedge/v1/kv/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -181,9 +179,7 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/fastedge/v1/kv/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/kv/{id}", + f"/fastedge/v1/kv/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -220,9 +216,7 @@ def replace( timeout: Override the client-level default timeout for this request, in seconds """ return self._put( - f"/fastedge/v1/kv/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/kv/{id}", + f"/fastedge/v1/kv/{id}", body=maybe_transform( { "byod": byod, @@ -286,7 +280,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/fastedge/v1/kv" if self._client._base_url_overridden else "https://api.gcore.com//fastedge/v1/kv", + "/fastedge/v1/kv", body=await async_maybe_transform( { "byod": byod, @@ -326,7 +320,7 @@ async def list( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/fastedge/v1/kv" if self._client._base_url_overridden else "https://api.gcore.com//fastedge/v1/kv", + "/fastedge/v1/kv", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -362,9 +356,7 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/fastedge/v1/kv/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/kv/{id}", + f"/fastedge/v1/kv/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -395,9 +387,7 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/fastedge/v1/kv/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/kv/{id}", + f"/fastedge/v1/kv/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -434,9 +424,7 @@ async def replace( timeout: Override the client-level default timeout for this request, in seconds """ return await self._put( - f"/fastedge/v1/kv/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/kv/{id}", + f"/fastedge/v1/kv/{id}", body=await async_maybe_transform( { "byod": byod, diff --git a/src/gcore/resources/fastedge/secrets.py b/src/gcore/resources/fastedge/secrets.py index beee5a6a..8b1e97e2 100644 --- a/src/gcore/resources/fastedge/secrets.py +++ b/src/gcore/resources/fastedge/secrets.py @@ -83,9 +83,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/fastedge/v1/secrets" - if self._client._base_url_overridden - else "https://api.gcore.com//fastedge/v1/secrets", + "/fastedge/v1/secrets", body=maybe_transform( { "name": name, @@ -133,9 +131,7 @@ def update( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/fastedge/v1/secrets/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/secrets/{id}", + f"/fastedge/v1/secrets/{id}", body=maybe_transform( { "comment": comment, @@ -179,9 +175,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/fastedge/v1/secrets" - if self._client._base_url_overridden - else "https://api.gcore.com//fastedge/v1/secrets", + "/fastedge/v1/secrets", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -226,9 +220,7 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/fastedge/v1/secrets/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/secrets/{id}", + f"/fastedge/v1/secrets/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -263,9 +255,7 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/fastedge/v1/secrets/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/secrets/{id}", + f"/fastedge/v1/secrets/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -305,9 +295,7 @@ def replace( timeout: Override the client-level default timeout for this request, in seconds """ return self._put( - f"/fastedge/v1/secrets/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/secrets/{id}", + f"/fastedge/v1/secrets/{id}", body=maybe_transform( { "name": name, @@ -375,9 +363,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/fastedge/v1/secrets" - if self._client._base_url_overridden - else "https://api.gcore.com//fastedge/v1/secrets", + "/fastedge/v1/secrets", body=await async_maybe_transform( { "name": name, @@ -425,9 +411,7 @@ async def update( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/fastedge/v1/secrets/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/secrets/{id}", + f"/fastedge/v1/secrets/{id}", body=await async_maybe_transform( { "comment": comment, @@ -471,9 +455,7 @@ async def list( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/fastedge/v1/secrets" - if self._client._base_url_overridden - else "https://api.gcore.com//fastedge/v1/secrets", + "/fastedge/v1/secrets", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -518,9 +500,7 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/fastedge/v1/secrets/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/secrets/{id}", + f"/fastedge/v1/secrets/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -555,9 +535,7 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/fastedge/v1/secrets/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/secrets/{id}", + f"/fastedge/v1/secrets/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -597,9 +575,7 @@ async def replace( timeout: Override the client-level default timeout for this request, in seconds """ return await self._put( - f"/fastedge/v1/secrets/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/secrets/{id}", + f"/fastedge/v1/secrets/{id}", body=await async_maybe_transform( { "name": name, diff --git a/src/gcore/resources/fastedge/statistics.py b/src/gcore/resources/fastedge/statistics.py index 9bc2a7ba..1958aafc 100644 --- a/src/gcore/resources/fastedge/statistics.py +++ b/src/gcore/resources/fastedge/statistics.py @@ -83,9 +83,7 @@ def get_call_series( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/fastedge/v1/stats/calls" - if self._client._base_url_overridden - else "https://api.gcore.com//fastedge/v1/stats/calls", + "/fastedge/v1/stats/calls", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -143,9 +141,7 @@ def get_duration_series( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/fastedge/v1/stats/app_duration" - if self._client._base_url_overridden - else "https://api.gcore.com//fastedge/v1/stats/app_duration", + "/fastedge/v1/stats/app_duration", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -224,9 +220,7 @@ async def get_call_series( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/fastedge/v1/stats/calls" - if self._client._base_url_overridden - else "https://api.gcore.com//fastedge/v1/stats/calls", + "/fastedge/v1/stats/calls", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -284,9 +278,7 @@ async def get_duration_series( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/fastedge/v1/stats/app_duration" - if self._client._base_url_overridden - else "https://api.gcore.com//fastedge/v1/stats/app_duration", + "/fastedge/v1/stats/app_duration", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/fastedge/templates.py b/src/gcore/resources/fastedge/templates.py index 78413275..a39e2757 100644 --- a/src/gcore/resources/fastedge/templates.py +++ b/src/gcore/resources/fastedge/templates.py @@ -93,9 +93,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/fastedge/v1/template" - if self._client._base_url_overridden - else "https://api.gcore.com//fastedge/v1/template", + "/fastedge/v1/template", body=maybe_transform( { "binary_id": binary_id, @@ -151,9 +149,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/fastedge/v1/template" - if self._client._base_url_overridden - else "https://api.gcore.com//fastedge/v1/template", + "/fastedge/v1/template", page=SyncOffsetPageFastedgeTemplates[TemplateShort], options=make_request_options( extra_headers=extra_headers, @@ -201,9 +197,7 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/fastedge/v1/template/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/template/{id}", + f"/fastedge/v1/template/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -238,9 +232,7 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/fastedge/v1/template/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/template/{id}", + f"/fastedge/v1/template/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -289,9 +281,7 @@ def replace( timeout: Override the client-level default timeout for this request, in seconds """ return self._put( - f"/fastedge/v1/template/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/template/{id}", + f"/fastedge/v1/template/{id}", body=maybe_transform( { "binary_id": binary_id, @@ -371,9 +361,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/fastedge/v1/template" - if self._client._base_url_overridden - else "https://api.gcore.com//fastedge/v1/template", + "/fastedge/v1/template", body=await async_maybe_transform( { "binary_id": binary_id, @@ -429,9 +417,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/fastedge/v1/template" - if self._client._base_url_overridden - else "https://api.gcore.com//fastedge/v1/template", + "/fastedge/v1/template", page=AsyncOffsetPageFastedgeTemplates[TemplateShort], options=make_request_options( extra_headers=extra_headers, @@ -479,9 +465,7 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/fastedge/v1/template/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/template/{id}", + f"/fastedge/v1/template/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -516,9 +500,7 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/fastedge/v1/template/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/template/{id}", + f"/fastedge/v1/template/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -567,9 +549,7 @@ async def replace( timeout: Override the client-level default timeout for this request, in seconds """ return await self._put( - f"/fastedge/v1/template/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//fastedge/v1/template/{id}", + f"/fastedge/v1/template/{id}", body=await async_maybe_transform( { "binary_id": binary_id, diff --git a/src/gcore/resources/iam/api_tokens.py b/src/gcore/resources/iam/api_tokens.py index 8e771ad5..ecd59cb6 100644 --- a/src/gcore/resources/iam/api_tokens.py +++ b/src/gcore/resources/iam/api_tokens.py @@ -80,9 +80,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - f"/iam/clients/{client_id}/tokens" - if self._client._base_url_overridden - else f"https://api.gcore.com//iam/clients/{client_id}/tokens", + f"/iam/clients/{client_id}/tokens", body=maybe_transform( { "client_user": client_user, @@ -149,9 +147,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/iam/clients/{client_id}/tokens" - if self._client._base_url_overridden - else f"https://api.gcore.com//iam/clients/{client_id}/tokens", + f"/iam/clients/{client_id}/tokens", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -200,9 +196,7 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/iam/clients/{client_id}/tokens/{token_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//iam/clients/{client_id}/tokens/{token_id}", + f"/iam/clients/{client_id}/tokens/{token_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -234,9 +228,7 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/iam/clients/{client_id}/tokens/{token_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//iam/clients/{client_id}/tokens/{token_id}", + f"/iam/clients/{client_id}/tokens/{token_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -301,9 +293,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - f"/iam/clients/{client_id}/tokens" - if self._client._base_url_overridden - else f"https://api.gcore.com//iam/clients/{client_id}/tokens", + f"/iam/clients/{client_id}/tokens", body=await async_maybe_transform( { "client_user": client_user, @@ -370,9 +360,7 @@ async def list( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/iam/clients/{client_id}/tokens" - if self._client._base_url_overridden - else f"https://api.gcore.com//iam/clients/{client_id}/tokens", + f"/iam/clients/{client_id}/tokens", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -421,9 +409,7 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/iam/clients/{client_id}/tokens/{token_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//iam/clients/{client_id}/tokens/{token_id}", + f"/iam/clients/{client_id}/tokens/{token_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -455,9 +441,7 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/iam/clients/{client_id}/tokens/{token_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//iam/clients/{client_id}/tokens/{token_id}", + f"/iam/clients/{client_id}/tokens/{token_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/iam/iam.py b/src/gcore/resources/iam/iam.py index e6fb22d8..54b4653f 100644 --- a/src/gcore/resources/iam/iam.py +++ b/src/gcore/resources/iam/iam.py @@ -75,7 +75,7 @@ def get_account_overview( ) -> AccountOverview: """Get information about your profile, users and other account details.""" return self._get( - "/iam/clients/me" if self._client._base_url_overridden else "https://api.gcore.com//iam/clients/me", + "/iam/clients/me", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -123,7 +123,7 @@ async def get_account_overview( ) -> AccountOverview: """Get information about your profile, users and other account details.""" return await self._get( - "/iam/clients/me" if self._client._base_url_overridden else "https://api.gcore.com//iam/clients/me", + "/iam/clients/me", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/iam/users.py b/src/gcore/resources/iam/users.py index 5f0cf949..a27021c1 100644 --- a/src/gcore/resources/iam/users.py +++ b/src/gcore/resources/iam/users.py @@ -101,9 +101,7 @@ def update( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/iam/users/{user_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//iam/users/{user_id}", + f"/iam/users/{user_id}", body=maybe_transform( { "auth_types": auth_types, @@ -154,7 +152,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/iam/users" if self._client._base_url_overridden else "https://api.gcore.com//iam/users", + "/iam/users", page=SyncOffsetPage[User], options=make_request_options( extra_headers=extra_headers, @@ -200,9 +198,7 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/iam/clients/{client_id}/client-users/{user_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//iam/clients/{client_id}/client-users/{user_id}", + f"/iam/clients/{client_id}/client-users/{user_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -233,9 +229,7 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/iam/users/{user_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//iam/users/{user_id}", + f"/iam/users/{user_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -281,9 +275,7 @@ def invite( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/iam/clients/invite_user" - if self._client._base_url_overridden - else "https://api.gcore.com//iam/clients/invite_user", + "/iam/clients/invite_user", body=maybe_transform( { "client_id": client_id, @@ -374,9 +366,7 @@ async def update( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/iam/users/{user_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//iam/users/{user_id}", + f"/iam/users/{user_id}", body=await async_maybe_transform( { "auth_types": auth_types, @@ -427,7 +417,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/iam/users" if self._client._base_url_overridden else "https://api.gcore.com//iam/users", + "/iam/users", page=AsyncOffsetPage[User], options=make_request_options( extra_headers=extra_headers, @@ -473,9 +463,7 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/iam/clients/{client_id}/client-users/{user_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//iam/clients/{client_id}/client-users/{user_id}", + f"/iam/clients/{client_id}/client-users/{user_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -506,9 +494,7 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/iam/users/{user_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//iam/users/{user_id}", + f"/iam/users/{user_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -554,9 +540,7 @@ async def invite( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/iam/clients/invite_user" - if self._client._base_url_overridden - else "https://api.gcore.com//iam/clients/invite_user", + "/iam/clients/invite_user", body=await async_maybe_transform( { "client_id": client_id, diff --git a/src/gcore/resources/security/bgp_announces.py b/src/gcore/resources/security/bgp_announces.py index fdbb1d33..43947fab 100644 --- a/src/gcore/resources/security/bgp_announces.py +++ b/src/gcore/resources/security/bgp_announces.py @@ -74,9 +74,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/security/sifter/v2/protected_addresses/announces" - if self._client._base_url_overridden - else "https://api.gcore.com//security/sifter/v2/protected_addresses/announces", + "/security/sifter/v2/protected_addresses/announces", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -124,9 +122,7 @@ def toggle( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/security/sifter/v2/protected_addresses/announces" - if self._client._base_url_overridden - else "https://api.gcore.com//security/sifter/v2/protected_addresses/announces", + "/security/sifter/v2/protected_addresses/announces", body=maybe_transform( { "announce": announce, @@ -195,9 +191,7 @@ async def list( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/security/sifter/v2/protected_addresses/announces" - if self._client._base_url_overridden - else "https://api.gcore.com//security/sifter/v2/protected_addresses/announces", + "/security/sifter/v2/protected_addresses/announces", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -245,9 +239,7 @@ async def toggle( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/security/sifter/v2/protected_addresses/announces" - if self._client._base_url_overridden - else "https://api.gcore.com//security/sifter/v2/protected_addresses/announces", + "/security/sifter/v2/protected_addresses/announces", body=await async_maybe_transform( { "announce": announce, diff --git a/src/gcore/resources/security/events.py b/src/gcore/resources/security/events.py index 98c34908..86d387bb 100644 --- a/src/gcore/resources/security/events.py +++ b/src/gcore/resources/security/events.py @@ -88,9 +88,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/security/notifier/v1/event_logs" - if self._client._base_url_overridden - else "https://api.gcore.com//security/notifier/v1/event_logs", + "/security/notifier/v1/event_logs", page=SyncOffsetPage[ClientView], options=make_request_options( extra_headers=extra_headers, @@ -176,9 +174,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/security/notifier/v1/event_logs" - if self._client._base_url_overridden - else "https://api.gcore.com//security/notifier/v1/event_logs", + "/security/notifier/v1/event_logs", page=AsyncOffsetPage[ClientView], options=make_request_options( extra_headers=extra_headers, diff --git a/src/gcore/resources/security/profile_templates.py b/src/gcore/resources/security/profile_templates.py index 79719fd7..85b84ad8 100644 --- a/src/gcore/resources/security/profile_templates.py +++ b/src/gcore/resources/security/profile_templates.py @@ -55,9 +55,7 @@ def list( profile. Client receives only common and created for him profile templates. """ return self._get( - "/security/iaas/profile-templates" - if self._client._base_url_overridden - else "https://api.gcore.com//security/iaas/profile-templates", + "/security/iaas/profile-templates", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -101,9 +99,7 @@ async def list( profile. Client receives only common and created for him profile templates. """ return await self._get( - "/security/iaas/profile-templates" - if self._client._base_url_overridden - else "https://api.gcore.com//security/iaas/profile-templates", + "/security/iaas/profile-templates", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/security/profiles.py b/src/gcore/resources/security/profiles.py index b3cd1183..16668afa 100644 --- a/src/gcore/resources/security/profiles.py +++ b/src/gcore/resources/security/profiles.py @@ -78,9 +78,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/security/iaas/v2/profiles" - if self._client._base_url_overridden - else "https://api.gcore.com//security/iaas/v2/profiles", + "/security/iaas/v2/profiles", body=maybe_transform( { "fields": fields, @@ -124,9 +122,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/security/iaas/v2/profiles" - if self._client._base_url_overridden - else "https://api.gcore.com//security/iaas/v2/profiles", + "/security/iaas/v2/profiles", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -172,9 +168,7 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/security/iaas/v2/profiles/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//security/iaas/v2/profiles/{id}", + f"/security/iaas/v2/profiles/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -205,9 +199,7 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/security/iaas/v2/profiles/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//security/iaas/v2/profiles/{id}", + f"/security/iaas/v2/profiles/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -242,9 +234,7 @@ def recreate( timeout: Override the client-level default timeout for this request, in seconds """ return self._put( - f"/security/iaas/v2/profiles/{id}/recreate" - if self._client._base_url_overridden - else f"https://api.gcore.com//security/iaas/v2/profiles/{id}/recreate", + f"/security/iaas/v2/profiles/{id}/recreate", body=maybe_transform( { "fields": fields, @@ -290,9 +280,7 @@ def replace( timeout: Override the client-level default timeout for this request, in seconds """ return self._put( - f"/security/iaas/v2/profiles/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//security/iaas/v2/profiles/{id}", + f"/security/iaas/v2/profiles/{id}", body=maybe_transform( { "fields": fields, @@ -358,9 +346,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/security/iaas/v2/profiles" - if self._client._base_url_overridden - else "https://api.gcore.com//security/iaas/v2/profiles", + "/security/iaas/v2/profiles", body=await async_maybe_transform( { "fields": fields, @@ -404,9 +390,7 @@ async def list( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/security/iaas/v2/profiles" - if self._client._base_url_overridden - else "https://api.gcore.com//security/iaas/v2/profiles", + "/security/iaas/v2/profiles", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -452,9 +436,7 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/security/iaas/v2/profiles/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//security/iaas/v2/profiles/{id}", + f"/security/iaas/v2/profiles/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -485,9 +467,7 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/security/iaas/v2/profiles/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//security/iaas/v2/profiles/{id}", + f"/security/iaas/v2/profiles/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -522,9 +502,7 @@ async def recreate( timeout: Override the client-level default timeout for this request, in seconds """ return await self._put( - f"/security/iaas/v2/profiles/{id}/recreate" - if self._client._base_url_overridden - else f"https://api.gcore.com//security/iaas/v2/profiles/{id}/recreate", + f"/security/iaas/v2/profiles/{id}/recreate", body=await async_maybe_transform( { "fields": fields, @@ -570,9 +548,7 @@ async def replace( timeout: Override the client-level default timeout for this request, in seconds """ return await self._put( - f"/security/iaas/v2/profiles/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//security/iaas/v2/profiles/{id}", + f"/security/iaas/v2/profiles/{id}", body=await async_maybe_transform( { "fields": fields, diff --git a/src/gcore/resources/storage/buckets/buckets.py b/src/gcore/resources/storage/buckets/buckets.py index cd7d3047..d8c41393 100644 --- a/src/gcore/resources/storage/buckets/buckets.py +++ b/src/gcore/resources/storage/buckets/buckets.py @@ -108,9 +108,7 @@ def create( raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -150,9 +148,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/storage/provisioning/v2/storage/{storage_id}/s3/buckets" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v2/storage/{storage_id}/s3/buckets", + f"/storage/provisioning/v2/storage/{storage_id}/s3/buckets", page=SyncOffsetPage[Bucket], options=make_request_options( extra_headers=extra_headers, @@ -200,9 +196,7 @@ def delete( raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -272,9 +266,7 @@ async def create( raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -314,9 +306,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/storage/provisioning/v2/storage/{storage_id}/s3/buckets" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v2/storage/{storage_id}/s3/buckets", + f"/storage/provisioning/v2/storage/{storage_id}/s3/buckets", page=AsyncOffsetPage[Bucket], options=make_request_options( extra_headers=extra_headers, @@ -364,9 +354,7 @@ async def delete( raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/storage/buckets/cors.py b/src/gcore/resources/storage/buckets/cors.py index d00928da..3869e78e 100644 --- a/src/gcore/resources/storage/buckets/cors.py +++ b/src/gcore/resources/storage/buckets/cors.py @@ -74,9 +74,7 @@ def create( raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/cors" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/cors", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/cors", body=maybe_transform({"allowed_origins": allowed_origins}, cor_create_params.CorCreateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -113,9 +111,7 @@ def get( if not bucket_name: raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") return self._get( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/cors" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/cors", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/cors", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -176,9 +172,7 @@ async def create( raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/cors" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/cors", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/cors", body=await async_maybe_transform({"allowed_origins": allowed_origins}, cor_create_params.CorCreateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -215,9 +209,7 @@ async def get( if not bucket_name: raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") return await self._get( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/cors" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/cors", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/cors", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/storage/buckets/lifecycle.py b/src/gcore/resources/storage/buckets/lifecycle.py index 8e7f3d81..a4940ef7 100644 --- a/src/gcore/resources/storage/buckets/lifecycle.py +++ b/src/gcore/resources/storage/buckets/lifecycle.py @@ -78,9 +78,7 @@ def create( raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/lifecycle" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/lifecycle", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/lifecycle", body=maybe_transform({"expiration_days": expiration_days}, lifecycle_create_params.LifecycleCreateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -117,9 +115,7 @@ def delete( raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/lifecycle" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/lifecycle", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/lifecycle", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -185,9 +181,7 @@ async def create( raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/lifecycle" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/lifecycle", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/lifecycle", body=await async_maybe_transform( {"expiration_days": expiration_days}, lifecycle_create_params.LifecycleCreateParams ), @@ -226,9 +220,7 @@ async def delete( raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/lifecycle" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/lifecycle", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/lifecycle", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/storage/buckets/policy.py b/src/gcore/resources/storage/buckets/policy.py index 7b89c11b..f84d2653 100644 --- a/src/gcore/resources/storage/buckets/policy.py +++ b/src/gcore/resources/storage/buckets/policy.py @@ -71,9 +71,7 @@ def create( raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -111,9 +109,7 @@ def delete( raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -148,9 +144,7 @@ def get( if not bucket_name: raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") return self._get( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -210,9 +204,7 @@ async def create( raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -250,9 +242,7 @@ async def delete( raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -287,9 +277,7 @@ async def get( if not bucket_name: raise ValueError(f"Expected a non-empty value for `bucket_name` but received {bucket_name!r}") return await self._get( - f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy", + f"/storage/provisioning/v1/storage/{storage_id}/s3/bucket/{bucket_name}/policy", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/storage/credentials.py b/src/gcore/resources/storage/credentials.py index ef93c1d2..5cc7224a 100644 --- a/src/gcore/resources/storage/credentials.py +++ b/src/gcore/resources/storage/credentials.py @@ -85,9 +85,7 @@ def recreate( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - f"/storage/provisioning/v1/storage/{storage_id}/credentials" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/credentials", + f"/storage/provisioning/v1/storage/{storage_id}/credentials", body=maybe_transform( { "delete_sftp_password": delete_sftp_password, @@ -169,9 +167,7 @@ async def recreate( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - f"/storage/provisioning/v1/storage/{storage_id}/credentials" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/credentials", + f"/storage/provisioning/v1/storage/{storage_id}/credentials", body=await async_maybe_transform( { "delete_sftp_password": delete_sftp_password, diff --git a/src/gcore/resources/storage/locations.py b/src/gcore/resources/storage/locations.py index 9d7c6670..5e2a2d96 100644 --- a/src/gcore/resources/storage/locations.py +++ b/src/gcore/resources/storage/locations.py @@ -69,9 +69,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/storage/provisioning/v2/locations" - if self._client._base_url_overridden - else "https://api.gcore.com//storage/provisioning/v2/locations", + "/storage/provisioning/v2/locations", page=SyncOffsetPage[Location], options=make_request_options( extra_headers=extra_headers, @@ -137,9 +135,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/storage/provisioning/v2/locations" - if self._client._base_url_overridden - else "https://api.gcore.com//storage/provisioning/v2/locations", + "/storage/provisioning/v2/locations", page=AsyncOffsetPage[Location], options=make_request_options( extra_headers=extra_headers, diff --git a/src/gcore/resources/storage/statistics.py b/src/gcore/resources/storage/statistics.py index 334749eb..980c1410 100644 --- a/src/gcore/resources/storage/statistics.py +++ b/src/gcore/resources/storage/statistics.py @@ -82,9 +82,7 @@ def get_usage_aggregated( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/storage/stats/v1/storage/usage/total" - if self._client._base_url_overridden - else "https://api.gcore.com//storage/stats/v1/storage/usage/total", + "/storage/stats/v1/storage/usage/total", body=maybe_transform( { "from_": from_, @@ -151,9 +149,7 @@ def get_usage_series( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/storage/stats/v1/storage/usage/series" - if self._client._base_url_overridden - else "https://api.gcore.com//storage/stats/v1/storage/usage/series", + "/storage/stats/v1/storage/usage/series", body=maybe_transform( { "from_": from_, @@ -233,9 +229,7 @@ async def get_usage_aggregated( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/storage/stats/v1/storage/usage/total" - if self._client._base_url_overridden - else "https://api.gcore.com//storage/stats/v1/storage/usage/total", + "/storage/stats/v1/storage/usage/total", body=await async_maybe_transform( { "from_": from_, @@ -302,9 +296,7 @@ async def get_usage_series( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/storage/stats/v1/storage/usage/series" - if self._client._base_url_overridden - else "https://api.gcore.com//storage/stats/v1/storage/usage/series", + "/storage/stats/v1/storage/usage/series", body=await async_maybe_transform( { "from_": from_, diff --git a/src/gcore/resources/storage/storage.py b/src/gcore/resources/storage/storage.py index e56f0531..9326bb88 100644 --- a/src/gcore/resources/storage/storage.py +++ b/src/gcore/resources/storage/storage.py @@ -138,9 +138,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/storage/provisioning/v2/storage" - if self._client._base_url_overridden - else "https://api.gcore.com//storage/provisioning/v2/storage", + "/storage/provisioning/v2/storage", body=maybe_transform( { "location": location, @@ -190,9 +188,7 @@ def update( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/storage/provisioning/v2/storage/{storage_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v2/storage/{storage_id}", + f"/storage/provisioning/v2/storage/{storage_id}", body=maybe_transform( { "expires": expires, @@ -262,9 +258,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/storage/provisioning/v3/storage" - if self._client._base_url_overridden - else "https://api.gcore.com//storage/provisioning/v3/storage", + "/storage/provisioning/v3/storage", page=SyncOffsetPage[Storage], options=make_request_options( extra_headers=extra_headers, @@ -316,9 +310,7 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/storage/provisioning/v1/storage/{storage_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}", + f"/storage/provisioning/v1/storage/{storage_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -350,9 +342,7 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/storage/provisioning/v1/storage/{storage_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}", + f"/storage/provisioning/v1/storage/{storage_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -387,9 +377,7 @@ def link_ssh_key( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - f"/storage/provisioning/v1/storage/{storage_id}/key/{key_id}/link" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/key/{key_id}/link", + f"/storage/provisioning/v1/storage/{storage_id}/key/{key_id}/link", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -423,9 +411,7 @@ def restore( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - f"/storage/provisioning/v1/storage/{storage_id}/restore" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/restore", + f"/storage/provisioning/v1/storage/{storage_id}/restore", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -464,9 +450,7 @@ def unlink_ssh_key( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - f"/storage/provisioning/v1/storage/{storage_id}/key/{key_id}/unlink" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/key/{key_id}/unlink", + f"/storage/provisioning/v1/storage/{storage_id}/key/{key_id}/unlink", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -556,9 +540,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/storage/provisioning/v2/storage" - if self._client._base_url_overridden - else "https://api.gcore.com//storage/provisioning/v2/storage", + "/storage/provisioning/v2/storage", body=await async_maybe_transform( { "location": location, @@ -608,9 +590,7 @@ async def update( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/storage/provisioning/v2/storage/{storage_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v2/storage/{storage_id}", + f"/storage/provisioning/v2/storage/{storage_id}", body=await async_maybe_transform( { "expires": expires, @@ -680,9 +660,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/storage/provisioning/v3/storage" - if self._client._base_url_overridden - else "https://api.gcore.com//storage/provisioning/v3/storage", + "/storage/provisioning/v3/storage", page=AsyncOffsetPage[Storage], options=make_request_options( extra_headers=extra_headers, @@ -734,9 +712,7 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/storage/provisioning/v1/storage/{storage_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}", + f"/storage/provisioning/v1/storage/{storage_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -768,9 +744,7 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/storage/provisioning/v1/storage/{storage_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}", + f"/storage/provisioning/v1/storage/{storage_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -805,9 +779,7 @@ async def link_ssh_key( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - f"/storage/provisioning/v1/storage/{storage_id}/key/{key_id}/link" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/key/{key_id}/link", + f"/storage/provisioning/v1/storage/{storage_id}/key/{key_id}/link", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -841,9 +813,7 @@ async def restore( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - f"/storage/provisioning/v1/storage/{storage_id}/restore" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/restore", + f"/storage/provisioning/v1/storage/{storage_id}/restore", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -884,9 +854,7 @@ async def unlink_ssh_key( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - f"/storage/provisioning/v1/storage/{storage_id}/key/{key_id}/unlink" - if self._client._base_url_overridden - else f"https://api.gcore.com//storage/provisioning/v1/storage/{storage_id}/key/{key_id}/unlink", + f"/storage/provisioning/v1/storage/{storage_id}/key/{key_id}/unlink", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/streaming/ai_tasks.py b/src/gcore/resources/streaming/ai_tasks.py index 02cb29a4..0b63144c 100644 --- a/src/gcore/resources/streaming/ai_tasks.py +++ b/src/gcore/resources/streaming/ai_tasks.py @@ -319,7 +319,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/streaming/ai/tasks" if self._client._base_url_overridden else "https://api.gcore.com//streaming/ai/tasks", + "/streaming/ai/tasks", body=maybe_transform( { "task_name": task_name, @@ -400,7 +400,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/streaming/ai/tasks" if self._client._base_url_overridden else "https://api.gcore.com//streaming/ai/tasks", + "/streaming/ai/tasks", page=SyncPageStreamingAI[AITask], options=make_request_options( extra_headers=extra_headers, @@ -451,9 +451,7 @@ def cancel( if not task_id: raise ValueError(f"Expected a non-empty value for `task_id` but received {task_id!r}") return self._post( - f"/streaming/ai/tasks/{task_id}/cancel" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/ai/tasks/{task_id}/cancel", + f"/streaming/ai/tasks/{task_id}/cancel", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -520,9 +518,7 @@ def get( if not task_id: raise ValueError(f"Expected a non-empty value for `task_id` but received {task_id!r}") return self._get( - f"/streaming/ai/tasks/{task_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/ai/tasks/{task_id}", + f"/streaming/ai/tasks/{task_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -594,7 +590,7 @@ def get_ai_settings( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/ai/info" if self._client._base_url_overridden else "https://api.gcore.com//streaming/ai/info", + "/streaming/ai/info", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -904,7 +900,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/streaming/ai/tasks" if self._client._base_url_overridden else "https://api.gcore.com//streaming/ai/tasks", + "/streaming/ai/tasks", body=await async_maybe_transform( { "task_name": task_name, @@ -985,7 +981,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/streaming/ai/tasks" if self._client._base_url_overridden else "https://api.gcore.com//streaming/ai/tasks", + "/streaming/ai/tasks", page=AsyncPageStreamingAI[AITask], options=make_request_options( extra_headers=extra_headers, @@ -1036,9 +1032,7 @@ async def cancel( if not task_id: raise ValueError(f"Expected a non-empty value for `task_id` but received {task_id!r}") return await self._post( - f"/streaming/ai/tasks/{task_id}/cancel" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/ai/tasks/{task_id}/cancel", + f"/streaming/ai/tasks/{task_id}/cancel", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1105,9 +1099,7 @@ async def get( if not task_id: raise ValueError(f"Expected a non-empty value for `task_id` but received {task_id!r}") return await self._get( - f"/streaming/ai/tasks/{task_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/ai/tasks/{task_id}", + f"/streaming/ai/tasks/{task_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1179,7 +1171,7 @@ async def get_ai_settings( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/ai/info" if self._client._base_url_overridden else "https://api.gcore.com//streaming/ai/info", + "/streaming/ai/info", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/streaming/broadcasts.py b/src/gcore/resources/streaming/broadcasts.py index 9461d5b2..d8ef434b 100644 --- a/src/gcore/resources/streaming/broadcasts.py +++ b/src/gcore/resources/streaming/broadcasts.py @@ -76,9 +76,7 @@ def create( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - "/streaming/broadcasts" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/broadcasts", + "/streaming/broadcasts", body=maybe_transform({"broadcast": broadcast}, broadcast_create_params.BroadcastCreateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -111,9 +109,7 @@ def update( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/streaming/broadcasts/{broadcast_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/broadcasts/{broadcast_id}", + f"/streaming/broadcasts/{broadcast_id}", body=maybe_transform({"broadcast": broadcast}, broadcast_update_params.BroadcastUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -150,9 +146,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/streaming/broadcasts" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/broadcasts", + "/streaming/broadcasts", page=SyncPageStreaming[Broadcast], options=make_request_options( extra_headers=extra_headers, @@ -189,9 +183,7 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/streaming/broadcasts/{broadcast_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/broadcasts/{broadcast_id}", + f"/streaming/broadcasts/{broadcast_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -222,9 +214,7 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/broadcasts/{broadcast_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/broadcasts/{broadcast_id}", + f"/streaming/broadcasts/{broadcast_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -255,9 +245,7 @@ def get_spectators_count( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/broadcasts/{broadcast_id}/spectators" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/broadcasts/{broadcast_id}/spectators", + f"/streaming/broadcasts/{broadcast_id}/spectators", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -318,9 +306,7 @@ async def create( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - "/streaming/broadcasts" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/broadcasts", + "/streaming/broadcasts", body=await async_maybe_transform({"broadcast": broadcast}, broadcast_create_params.BroadcastCreateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -353,9 +339,7 @@ async def update( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/streaming/broadcasts/{broadcast_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/broadcasts/{broadcast_id}", + f"/streaming/broadcasts/{broadcast_id}", body=await async_maybe_transform({"broadcast": broadcast}, broadcast_update_params.BroadcastUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -392,9 +376,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/streaming/broadcasts" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/broadcasts", + "/streaming/broadcasts", page=AsyncPageStreaming[Broadcast], options=make_request_options( extra_headers=extra_headers, @@ -431,9 +413,7 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/streaming/broadcasts/{broadcast_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/broadcasts/{broadcast_id}", + f"/streaming/broadcasts/{broadcast_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -464,9 +444,7 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/broadcasts/{broadcast_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/broadcasts/{broadcast_id}", + f"/streaming/broadcasts/{broadcast_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -497,9 +475,7 @@ async def get_spectators_count( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/broadcasts/{broadcast_id}/spectators" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/broadcasts/{broadcast_id}/spectators", + f"/streaming/broadcasts/{broadcast_id}/spectators", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/streaming/directories.py b/src/gcore/resources/streaming/directories.py index 345cfc7a..438d9de8 100644 --- a/src/gcore/resources/streaming/directories.py +++ b/src/gcore/resources/streaming/directories.py @@ -72,9 +72,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/streaming/directories" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/directories", + "/streaming/directories", body=maybe_transform( { "name": name, @@ -119,9 +117,7 @@ def update( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/streaming/directories/{directory_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/directories/{directory_id}", + f"/streaming/directories/{directory_id}", body=maybe_transform( { "name": name, @@ -167,9 +163,7 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/streaming/directories/{directory_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/directories/{directory_id}", + f"/streaming/directories/{directory_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -202,9 +196,7 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/directories/{directory_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/directories/{directory_id}", + f"/streaming/directories/{directory_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -227,9 +219,7 @@ def get_tree( directories in video hosting. """ return self._get( - "/streaming/directories/tree" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/directories/tree", + "/streaming/directories/tree", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -286,9 +276,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/streaming/directories" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/directories", + "/streaming/directories", body=await async_maybe_transform( { "name": name, @@ -333,9 +321,7 @@ async def update( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/streaming/directories/{directory_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/directories/{directory_id}", + f"/streaming/directories/{directory_id}", body=await async_maybe_transform( { "name": name, @@ -381,9 +367,7 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/streaming/directories/{directory_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/directories/{directory_id}", + f"/streaming/directories/{directory_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -416,9 +400,7 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/directories/{directory_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/directories/{directory_id}", + f"/streaming/directories/{directory_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -441,9 +423,7 @@ async def get_tree( directories in video hosting. """ return await self._get( - "/streaming/directories/tree" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/directories/tree", + "/streaming/directories/tree", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/streaming/players.py b/src/gcore/resources/streaming/players.py index 942e32b9..826e015a 100644 --- a/src/gcore/resources/streaming/players.py +++ b/src/gcore/resources/streaming/players.py @@ -72,7 +72,7 @@ def create( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - "/streaming/players" if self._client._base_url_overridden else "https://api.gcore.com//streaming/players", + "/streaming/players", body=maybe_transform({"player": player}, player_create_params.PlayerCreateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -109,9 +109,7 @@ def update( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/streaming/players/{player_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/players/{player_id}", + f"/streaming/players/{player_id}", body=maybe_transform({"player": player}, player_update_params.PlayerUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -146,7 +144,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/streaming/players" if self._client._base_url_overridden else "https://api.gcore.com//streaming/players", + "/streaming/players", page=SyncPageStreaming[Player], options=make_request_options( extra_headers=extra_headers, @@ -183,9 +181,7 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/streaming/players/{player_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/players/{player_id}", + f"/streaming/players/{player_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -216,9 +212,7 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/players/{player_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/players/{player_id}", + f"/streaming/players/{player_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -250,9 +244,7 @@ def preview( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._get( - f"/streaming/players/{player_id}/preview" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/players/{player_id}/preview", + f"/streaming/players/{player_id}/preview", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -309,7 +301,7 @@ async def create( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - "/streaming/players" if self._client._base_url_overridden else "https://api.gcore.com//streaming/players", + "/streaming/players", body=await async_maybe_transform({"player": player}, player_create_params.PlayerCreateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -346,9 +338,7 @@ async def update( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/streaming/players/{player_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/players/{player_id}", + f"/streaming/players/{player_id}", body=await async_maybe_transform({"player": player}, player_update_params.PlayerUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -383,7 +373,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/streaming/players" if self._client._base_url_overridden else "https://api.gcore.com//streaming/players", + "/streaming/players", page=AsyncPageStreaming[Player], options=make_request_options( extra_headers=extra_headers, @@ -420,9 +410,7 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/streaming/players/{player_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/players/{player_id}", + f"/streaming/players/{player_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -453,9 +441,7 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/players/{player_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/players/{player_id}", + f"/streaming/players/{player_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -487,9 +473,7 @@ async def preview( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._get( - f"/streaming/players/{player_id}/preview" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/players/{player_id}/preview", + f"/streaming/players/{player_id}/preview", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/streaming/playlists.py b/src/gcore/resources/streaming/playlists.py index c9b9c691..fba76526 100644 --- a/src/gcore/resources/streaming/playlists.py +++ b/src/gcore/resources/streaming/playlists.py @@ -204,9 +204,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/streaming/playlists" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/playlists", + "/streaming/playlists", body=maybe_transform( { "active": active, @@ -337,9 +335,7 @@ def update( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/streaming/playlists/{playlist_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/playlists/{playlist_id}", + f"/streaming/playlists/{playlist_id}", body=maybe_transform( { "active": active, @@ -392,9 +388,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/streaming/playlists" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/playlists", + "/streaming/playlists", page=SyncPageStreaming[Playlist], options=make_request_options( extra_headers=extra_headers, @@ -431,9 +425,7 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/streaming/playlists/{playlist_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/playlists/{playlist_id}", + f"/streaming/playlists/{playlist_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -464,9 +456,7 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/playlists/{playlist_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/playlists/{playlist_id}", + f"/streaming/playlists/{playlist_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -497,9 +487,7 @@ def list_videos( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/playlists/{playlist_id}/videos" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/playlists/{playlist_id}/videos", + f"/streaming/playlists/{playlist_id}/videos", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -684,9 +672,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/streaming/playlists" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/playlists", + "/streaming/playlists", body=await async_maybe_transform( { "active": active, @@ -817,9 +803,7 @@ async def update( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/streaming/playlists/{playlist_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/playlists/{playlist_id}", + f"/streaming/playlists/{playlist_id}", body=await async_maybe_transform( { "active": active, @@ -872,9 +856,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/streaming/playlists" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/playlists", + "/streaming/playlists", page=AsyncPageStreaming[Playlist], options=make_request_options( extra_headers=extra_headers, @@ -911,9 +893,7 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/streaming/playlists/{playlist_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/playlists/{playlist_id}", + f"/streaming/playlists/{playlist_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -944,9 +924,7 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/playlists/{playlist_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/playlists/{playlist_id}", + f"/streaming/playlists/{playlist_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -977,9 +955,7 @@ async def list_videos( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/playlists/{playlist_id}/videos" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/playlists/{playlist_id}/videos", + f"/streaming/playlists/{playlist_id}/videos", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/streaming/quality_sets.py b/src/gcore/resources/streaming/quality_sets.py index a80ce0b3..825c12da 100644 --- a/src/gcore/resources/streaming/quality_sets.py +++ b/src/gcore/resources/streaming/quality_sets.py @@ -91,9 +91,7 @@ def list( is a paid feature. """ return self._get( - "/streaming/quality_sets" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/quality_sets", + "/streaming/quality_sets", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -139,9 +137,7 @@ def set_default( timeout: Override the client-level default timeout for this request, in seconds """ return self._put( - "/streaming/quality_sets/default" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/quality_sets/default", + "/streaming/quality_sets/default", body=maybe_transform( { "live": live, @@ -226,9 +222,7 @@ async def list( is a paid feature. """ return await self._get( - "/streaming/quality_sets" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/quality_sets", + "/streaming/quality_sets", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -274,9 +268,7 @@ async def set_default( timeout: Override the client-level default timeout for this request, in seconds """ return await self._put( - "/streaming/quality_sets/default" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/quality_sets/default", + "/streaming/quality_sets/default", body=await async_maybe_transform( { "live": live, diff --git a/src/gcore/resources/streaming/restreams.py b/src/gcore/resources/streaming/restreams.py index 1d703166..78880ed4 100644 --- a/src/gcore/resources/streaming/restreams.py +++ b/src/gcore/resources/streaming/restreams.py @@ -67,9 +67,7 @@ def create( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - "/streaming/restreams" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/restreams", + "/streaming/restreams", body=maybe_transform({"restream": restream}, restream_create_params.RestreamCreateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -102,9 +100,7 @@ def update( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/streaming/restreams/{restream_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/restreams/{restream_id}", + f"/streaming/restreams/{restream_id}", body=maybe_transform({"restream": restream}, restream_update_params.RestreamUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -139,9 +135,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/streaming/restreams" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/restreams", + "/streaming/restreams", page=SyncPageStreaming[Restream], options=make_request_options( extra_headers=extra_headers, @@ -178,9 +172,7 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/streaming/restreams/{restream_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/restreams/{restream_id}", + f"/streaming/restreams/{restream_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -211,9 +203,7 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/restreams/{restream_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/restreams/{restream_id}", + f"/streaming/restreams/{restream_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -266,9 +256,7 @@ async def create( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - "/streaming/restreams" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/restreams", + "/streaming/restreams", body=await async_maybe_transform({"restream": restream}, restream_create_params.RestreamCreateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -301,9 +289,7 @@ async def update( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/streaming/restreams/{restream_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/restreams/{restream_id}", + f"/streaming/restreams/{restream_id}", body=await async_maybe_transform({"restream": restream}, restream_update_params.RestreamUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -338,9 +324,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/streaming/restreams" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/restreams", + "/streaming/restreams", page=AsyncPageStreaming[Restream], options=make_request_options( extra_headers=extra_headers, @@ -377,9 +361,7 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/streaming/restreams/{restream_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/restreams/{restream_id}", + f"/streaming/restreams/{restream_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -410,9 +392,7 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/restreams/{restream_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/restreams/{restream_id}", + f"/streaming/restreams/{restream_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/streaming/statistics.py b/src/gcore/resources/streaming/statistics.py index 2b5e440d..4e8cb182 100644 --- a/src/gcore/resources/streaming/statistics.py +++ b/src/gcore/resources/streaming/statistics.py @@ -123,9 +123,7 @@ def get_ffprobes( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/ffprobe" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/ffprobe", + "/streaming/statistics/ffprobe", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -190,9 +188,7 @@ def get_live_unique_viewers( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/stream/viewers" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/stream/viewers", + "/streaming/statistics/stream/viewers", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -258,9 +254,7 @@ def get_live_watch_time_cdn( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/stream/watching_duration" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/stream/watching_duration", + "/streaming/statistics/stream/watching_duration", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -321,9 +315,7 @@ def get_live_watch_time_total_cdn( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/stream/watching_duration/total" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/stream/watching_duration/total", + "/streaming/statistics/stream/watching_duration/total", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -376,9 +368,7 @@ def get_max_streams_series( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/max_stream" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/max_stream", + "/streaming/statistics/max_stream", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -431,9 +421,7 @@ def get_popular_videos( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/popular" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/popular", + "/streaming/statistics/popular", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -484,9 +472,7 @@ def get_storage_series( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/storage" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/storage", + "/streaming/statistics/storage", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -538,9 +524,7 @@ def get_stream_series( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/stream" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/stream", + "/streaming/statistics/stream", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -613,9 +597,7 @@ def get_unique_viewers( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/uniqs" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/uniqs", + "/streaming/statistics/uniqs", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -702,9 +684,7 @@ def get_unique_viewers_cdn( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/cdn/uniqs" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/cdn/uniqs", + "/streaming/statistics/cdn/uniqs", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -778,9 +758,7 @@ def get_views( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/views" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/views", + "/streaming/statistics/views", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -837,9 +815,7 @@ def get_views_by_browsers( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/browsers" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/browsers", + "/streaming/statistics/browsers", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -890,9 +866,7 @@ def get_views_by_country( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/countries" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/countries", + "/streaming/statistics/countries", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -943,9 +917,7 @@ def get_views_by_hostname( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/hosts" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/hosts", + "/streaming/statistics/hosts", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -996,9 +968,7 @@ def get_views_by_operating_system( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/systems" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/systems", + "/streaming/statistics/systems", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1049,9 +1019,7 @@ def get_views_by_referer( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/embeds" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/embeds", + "/streaming/statistics/embeds", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1102,9 +1070,7 @@ def get_views_by_region( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/regions" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/regions", + "/streaming/statistics/regions", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1164,9 +1130,7 @@ def get_views_heatmap( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/heatmap" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/heatmap", + "/streaming/statistics/heatmap", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1216,9 +1180,7 @@ def get_vod_storage_volume( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/vod/storage_duration" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/vod/storage_duration", + "/streaming/statistics/vod/storage_duration", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1266,9 +1228,7 @@ def get_vod_transcoding_duration( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/vod/transcoding_duration" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/vod/transcoding_duration", + "/streaming/statistics/vod/transcoding_duration", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1329,9 +1289,7 @@ def get_vod_unique_viewers_cdn( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/vod/viewers" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/vod/viewers", + "/streaming/statistics/vod/viewers", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1397,9 +1355,7 @@ def get_vod_watch_time_cdn( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/vod/watching_duration" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/vod/watching_duration", + "/streaming/statistics/vod/watching_duration", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1460,9 +1416,7 @@ def get_vod_watch_time_total_cdn( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/streaming/statistics/vod/watching_duration/total" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/vod/watching_duration/total", + "/streaming/statistics/vod/watching_duration/total", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1539,9 +1493,7 @@ async def get_ffprobes( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/ffprobe" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/ffprobe", + "/streaming/statistics/ffprobe", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1606,9 +1558,7 @@ async def get_live_unique_viewers( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/stream/viewers" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/stream/viewers", + "/streaming/statistics/stream/viewers", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1674,9 +1624,7 @@ async def get_live_watch_time_cdn( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/stream/watching_duration" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/stream/watching_duration", + "/streaming/statistics/stream/watching_duration", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1737,9 +1685,7 @@ async def get_live_watch_time_total_cdn( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/stream/watching_duration/total" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/stream/watching_duration/total", + "/streaming/statistics/stream/watching_duration/total", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1792,9 +1738,7 @@ async def get_max_streams_series( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/max_stream" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/max_stream", + "/streaming/statistics/max_stream", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1847,9 +1791,7 @@ async def get_popular_videos( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/popular" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/popular", + "/streaming/statistics/popular", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1900,9 +1842,7 @@ async def get_storage_series( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/storage" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/storage", + "/streaming/statistics/storage", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1954,9 +1894,7 @@ async def get_stream_series( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/stream" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/stream", + "/streaming/statistics/stream", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2029,9 +1967,7 @@ async def get_unique_viewers( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/uniqs" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/uniqs", + "/streaming/statistics/uniqs", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2118,9 +2054,7 @@ async def get_unique_viewers_cdn( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/cdn/uniqs" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/cdn/uniqs", + "/streaming/statistics/cdn/uniqs", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2194,9 +2128,7 @@ async def get_views( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/views" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/views", + "/streaming/statistics/views", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2253,9 +2185,7 @@ async def get_views_by_browsers( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/browsers" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/browsers", + "/streaming/statistics/browsers", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2306,9 +2236,7 @@ async def get_views_by_country( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/countries" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/countries", + "/streaming/statistics/countries", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2359,9 +2287,7 @@ async def get_views_by_hostname( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/hosts" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/hosts", + "/streaming/statistics/hosts", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2412,9 +2338,7 @@ async def get_views_by_operating_system( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/systems" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/systems", + "/streaming/statistics/systems", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2465,9 +2389,7 @@ async def get_views_by_referer( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/embeds" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/embeds", + "/streaming/statistics/embeds", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2518,9 +2440,7 @@ async def get_views_by_region( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/regions" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/regions", + "/streaming/statistics/regions", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2580,9 +2500,7 @@ async def get_views_heatmap( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/heatmap" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/heatmap", + "/streaming/statistics/heatmap", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2632,9 +2550,7 @@ async def get_vod_storage_volume( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/vod/storage_duration" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/vod/storage_duration", + "/streaming/statistics/vod/storage_duration", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2682,9 +2598,7 @@ async def get_vod_transcoding_duration( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/vod/transcoding_duration" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/vod/transcoding_duration", + "/streaming/statistics/vod/transcoding_duration", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2745,9 +2659,7 @@ async def get_vod_unique_viewers_cdn( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/vod/viewers" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/vod/viewers", + "/streaming/statistics/vod/viewers", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2813,9 +2725,7 @@ async def get_vod_watch_time_cdn( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/vod/watching_duration" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/vod/watching_duration", + "/streaming/statistics/vod/watching_duration", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -2876,9 +2786,7 @@ async def get_vod_watch_time_total_cdn( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/streaming/statistics/vod/watching_duration/total" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/statistics/vod/watching_duration/total", + "/streaming/statistics/vod/watching_duration/total", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/streaming/streams/overlays.py b/src/gcore/resources/streaming/streams/overlays.py index 58dfaf62..f52cfee4 100644 --- a/src/gcore/resources/streaming/streams/overlays.py +++ b/src/gcore/resources/streaming/streams/overlays.py @@ -123,9 +123,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - f"/streaming/streams/{stream_id}/overlays" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/streams/{stream_id}/overlays", + f"/streaming/streams/{stream_id}/overlays", body=maybe_transform(body, Iterable[overlay_create_params.Body]), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -177,9 +175,7 @@ def update( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/streaming/streams/{stream_id}/overlays/{overlay_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/streams/{stream_id}/overlays/{overlay_id}", + f"/streaming/streams/{stream_id}/overlays/{overlay_id}", body=maybe_transform( { "height": height, @@ -221,9 +217,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/streams/{stream_id}/overlays" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/streams/{stream_id}/overlays", + f"/streaming/streams/{stream_id}/overlays", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -256,9 +250,7 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/streaming/streams/{stream_id}/overlays/{overlay_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/streams/{stream_id}/overlays/{overlay_id}", + f"/streaming/streams/{stream_id}/overlays/{overlay_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -290,9 +282,7 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/streams/{stream_id}/overlays/{overlay_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/streams/{stream_id}/overlays/{overlay_id}", + f"/streaming/streams/{stream_id}/overlays/{overlay_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -324,9 +314,7 @@ def update_multiple( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/streaming/streams/{stream_id}/overlays" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/streams/{stream_id}/overlays", + f"/streaming/streams/{stream_id}/overlays", body=maybe_transform(body, Iterable[overlay_update_multiple_params.Body]), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -432,9 +420,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - f"/streaming/streams/{stream_id}/overlays" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/streams/{stream_id}/overlays", + f"/streaming/streams/{stream_id}/overlays", body=await async_maybe_transform(body, Iterable[overlay_create_params.Body]), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -486,9 +472,7 @@ async def update( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/streaming/streams/{stream_id}/overlays/{overlay_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/streams/{stream_id}/overlays/{overlay_id}", + f"/streaming/streams/{stream_id}/overlays/{overlay_id}", body=await async_maybe_transform( { "height": height, @@ -530,9 +514,7 @@ async def list( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/streams/{stream_id}/overlays" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/streams/{stream_id}/overlays", + f"/streaming/streams/{stream_id}/overlays", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -565,9 +547,7 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/streaming/streams/{stream_id}/overlays/{overlay_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/streams/{stream_id}/overlays/{overlay_id}", + f"/streaming/streams/{stream_id}/overlays/{overlay_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -599,9 +579,7 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/streams/{stream_id}/overlays/{overlay_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/streams/{stream_id}/overlays/{overlay_id}", + f"/streaming/streams/{stream_id}/overlays/{overlay_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -633,9 +611,7 @@ async def update_multiple( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/streaming/streams/{stream_id}/overlays" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/streams/{stream_id}/overlays", + f"/streaming/streams/{stream_id}/overlays", body=await async_maybe_transform(body, Iterable[overlay_update_multiple_params.Body]), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout diff --git a/src/gcore/resources/streaming/streams/streams.py b/src/gcore/resources/streaming/streams/streams.py index 06bc5dcc..30c0c23b 100644 --- a/src/gcore/resources/streaming/streams/streams.py +++ b/src/gcore/resources/streaming/streams/streams.py @@ -232,7 +232,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/streaming/streams" if self._client._base_url_overridden else "https://api.gcore.com//streaming/streams", + "/streaming/streams", body=maybe_transform( { "name": name, @@ -285,9 +285,7 @@ def update( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/streaming/streams/{stream_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/streams/{stream_id}", + f"/streaming/streams/{stream_id}", body=maybe_transform({"stream": stream}, stream_update_params.StreamUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -326,7 +324,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/streaming/streams" if self._client._base_url_overridden else "https://api.gcore.com//streaming/streams", + "/streaming/streams", page=SyncPageStreaming[Stream], options=make_request_options( extra_headers=extra_headers, @@ -385,9 +383,7 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/streaming/streams/{stream_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/streams/{stream_id}", + f"/streaming/streams/{stream_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -419,9 +415,7 @@ def clear_dvr( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._put( - f"/streaming/streams/{stream_id}/dvr_cleanup" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/streams/{stream_id}/dvr_cleanup", + f"/streaming/streams/{stream_id}/dvr_cleanup", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -529,9 +523,7 @@ def create_clip( timeout: Override the client-level default timeout for this request, in seconds """ return self._put( - f"/streaming/streams/{stream_id}/clip_recording" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/streams/{stream_id}/clip_recording", + f"/streaming/streams/{stream_id}/clip_recording", body=maybe_transform( { "duration": duration, @@ -571,9 +563,7 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/streams/{stream_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/streams/{stream_id}", + f"/streaming/streams/{stream_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -622,9 +612,7 @@ def list_clips( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/streams/{stream_id}/clip_recording" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/streams/{stream_id}/clip_recording", + f"/streaming/streams/{stream_id}/clip_recording", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -692,9 +680,7 @@ def start_recording( timeout: Override the client-level default timeout for this request, in seconds """ return self._put( - f"/streaming/streams/{stream_id}/start_recording" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/streams/{stream_id}/start_recording", + f"/streaming/streams/{stream_id}/start_recording", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -731,9 +717,7 @@ def stop_recording( timeout: Override the client-level default timeout for this request, in seconds """ return self._put( - f"/streaming/streams/{stream_id}/stop_recording" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/streams/{stream_id}/stop_recording", + f"/streaming/streams/{stream_id}/stop_recording", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -931,7 +915,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/streaming/streams" if self._client._base_url_overridden else "https://api.gcore.com//streaming/streams", + "/streaming/streams", body=await async_maybe_transform( { "name": name, @@ -984,9 +968,7 @@ async def update( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/streaming/streams/{stream_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/streams/{stream_id}", + f"/streaming/streams/{stream_id}", body=await async_maybe_transform({"stream": stream}, stream_update_params.StreamUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -1025,7 +1007,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/streaming/streams" if self._client._base_url_overridden else "https://api.gcore.com//streaming/streams", + "/streaming/streams", page=AsyncPageStreaming[Stream], options=make_request_options( extra_headers=extra_headers, @@ -1084,9 +1066,7 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/streaming/streams/{stream_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/streams/{stream_id}", + f"/streaming/streams/{stream_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1118,9 +1098,7 @@ async def clear_dvr( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._put( - f"/streaming/streams/{stream_id}/dvr_cleanup" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/streams/{stream_id}/dvr_cleanup", + f"/streaming/streams/{stream_id}/dvr_cleanup", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1228,9 +1206,7 @@ async def create_clip( timeout: Override the client-level default timeout for this request, in seconds """ return await self._put( - f"/streaming/streams/{stream_id}/clip_recording" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/streams/{stream_id}/clip_recording", + f"/streaming/streams/{stream_id}/clip_recording", body=await async_maybe_transform( { "duration": duration, @@ -1270,9 +1246,7 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/streams/{stream_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/streams/{stream_id}", + f"/streaming/streams/{stream_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1321,9 +1295,7 @@ async def list_clips( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/streams/{stream_id}/clip_recording" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/streams/{stream_id}/clip_recording", + f"/streaming/streams/{stream_id}/clip_recording", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1391,9 +1363,7 @@ async def start_recording( timeout: Override the client-level default timeout for this request, in seconds """ return await self._put( - f"/streaming/streams/{stream_id}/start_recording" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/streams/{stream_id}/start_recording", + f"/streaming/streams/{stream_id}/start_recording", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1430,9 +1400,7 @@ async def stop_recording( timeout: Override the client-level default timeout for this request, in seconds """ return await self._put( - f"/streaming/streams/{stream_id}/stop_recording" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/streams/{stream_id}/stop_recording", + f"/streaming/streams/{stream_id}/stop_recording", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/streaming/videos/subtitles.py b/src/gcore/resources/streaming/videos/subtitles.py index 165594a4..4e59615e 100644 --- a/src/gcore/resources/streaming/videos/subtitles.py +++ b/src/gcore/resources/streaming/videos/subtitles.py @@ -120,9 +120,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - f"/streaming/videos/{video_id}/subtitles" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/videos/{video_id}/subtitles", + f"/streaming/videos/{video_id}/subtitles", body=maybe_transform(body, subtitle_create_params.SubtitleCreateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -172,9 +170,7 @@ def update( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/streaming/videos/{video_id}/subtitles/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/videos/{video_id}/subtitles/{id}", + f"/streaming/videos/{video_id}/subtitles/{id}", body=maybe_transform( { "language": language, @@ -213,9 +209,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/videos/{video_id}/subtitles" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/videos/{video_id}/subtitles", + f"/streaming/videos/{video_id}/subtitles", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -248,9 +242,7 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/streaming/videos/{video_id}/subtitles/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/videos/{video_id}/subtitles/{id}", + f"/streaming/videos/{video_id}/subtitles/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -282,9 +274,7 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/videos/{video_id}/subtitles/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/videos/{video_id}/subtitles/{id}", + f"/streaming/videos/{video_id}/subtitles/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -389,9 +379,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - f"/streaming/videos/{video_id}/subtitles" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/videos/{video_id}/subtitles", + f"/streaming/videos/{video_id}/subtitles", body=await async_maybe_transform(body, subtitle_create_params.SubtitleCreateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -441,9 +429,7 @@ async def update( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/streaming/videos/{video_id}/subtitles/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/videos/{video_id}/subtitles/{id}", + f"/streaming/videos/{video_id}/subtitles/{id}", body=await async_maybe_transform( { "language": language, @@ -482,9 +468,7 @@ async def list( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/videos/{video_id}/subtitles" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/videos/{video_id}/subtitles", + f"/streaming/videos/{video_id}/subtitles", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -517,9 +501,7 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/streaming/videos/{video_id}/subtitles/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/videos/{video_id}/subtitles/{id}", + f"/streaming/videos/{video_id}/subtitles/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -551,9 +533,7 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/videos/{video_id}/subtitles/{id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/videos/{video_id}/subtitles/{id}", + f"/streaming/videos/{video_id}/subtitles/{id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/streaming/videos/videos.py b/src/gcore/resources/streaming/videos/videos.py index 3b1cfbef..c77320db 100644 --- a/src/gcore/resources/streaming/videos/videos.py +++ b/src/gcore/resources/streaming/videos/videos.py @@ -148,7 +148,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/streaming/videos" if self._client._base_url_overridden else "https://api.gcore.com//streaming/videos", + "/streaming/videos", body=maybe_transform({"video": video}, video_create_params.VideoCreateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -371,9 +371,7 @@ def update( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/streaming/videos/{video_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/videos/{video_id}", + f"/streaming/videos/{video_id}", body=maybe_transform( { "name": name, @@ -469,7 +467,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/streaming/videos" if self._client._base_url_overridden else "https://api.gcore.com//streaming/videos", + "/streaming/videos", page=SyncPageStreaming[Video], options=make_request_options( extra_headers=extra_headers, @@ -526,9 +524,7 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/streaming/videos/{video_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/videos/{video_id}", + f"/streaming/videos/{video_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -579,9 +575,7 @@ def create_multiple( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/streaming/videos/batch" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/videos/batch", + "/streaming/videos/batch", body=maybe_transform({"videos": videos}, video_create_multiple_params.VideoCreateMultipleParams), options=make_request_options( extra_headers=extra_headers, @@ -631,9 +625,7 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/videos/{video_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/videos/{video_id}", + f"/streaming/videos/{video_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -693,9 +685,7 @@ def get_parameters_for_direct_upload( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/streaming/videos/{video_id}/upload" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/videos/{video_id}/upload", + f"/streaming/videos/{video_id}/upload", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -729,9 +719,7 @@ def list_names( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._get( - "/streaming/videos/names" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/videos/names", + "/streaming/videos/names", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -848,7 +836,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/streaming/videos" if self._client._base_url_overridden else "https://api.gcore.com//streaming/videos", + "/streaming/videos", body=await async_maybe_transform({"video": video}, video_create_params.VideoCreateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -1071,9 +1059,7 @@ async def update( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/streaming/videos/{video_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/videos/{video_id}", + f"/streaming/videos/{video_id}", body=await async_maybe_transform( { "name": name, @@ -1169,7 +1155,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/streaming/videos" if self._client._base_url_overridden else "https://api.gcore.com//streaming/videos", + "/streaming/videos", page=AsyncPageStreaming[Video], options=make_request_options( extra_headers=extra_headers, @@ -1226,9 +1212,7 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/streaming/videos/{video_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/videos/{video_id}", + f"/streaming/videos/{video_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1279,9 +1263,7 @@ async def create_multiple( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/streaming/videos/batch" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/videos/batch", + "/streaming/videos/batch", body=await async_maybe_transform( {"videos": videos}, video_create_multiple_params.VideoCreateMultipleParams ), @@ -1335,9 +1317,7 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/videos/{video_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/videos/{video_id}", + f"/streaming/videos/{video_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1397,9 +1377,7 @@ async def get_parameters_for_direct_upload( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/streaming/videos/{video_id}/upload" - if self._client._base_url_overridden - else f"https://api.gcore.com//streaming/videos/{video_id}/upload", + f"/streaming/videos/{video_id}/upload", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -1433,9 +1411,7 @@ async def list_names( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._get( - "/streaming/videos/names" - if self._client._base_url_overridden - else "https://api.gcore.com//streaming/videos/names", + "/streaming/videos/names", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/waap/advanced_rules.py b/src/gcore/resources/waap/advanced_rules.py index 96f15cca..30c32c1c 100644 --- a/src/gcore/resources/waap/advanced_rules.py +++ b/src/gcore/resources/waap/advanced_rules.py @@ -51,9 +51,7 @@ def list( ) -> WaapAdvancedRuleDescriptorList: """Retrieve an advanced rules descriptor""" return self._get( - "/waap/v1/advanced-rules/descriptor" - if self._client._base_url_overridden - else "https://api.gcore.com//waap/v1/advanced-rules/descriptor", + "/waap/v1/advanced-rules/descriptor", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -93,9 +91,7 @@ async def list( ) -> WaapAdvancedRuleDescriptorList: """Retrieve an advanced rules descriptor""" return await self._get( - "/waap/v1/advanced-rules/descriptor" - if self._client._base_url_overridden - else "https://api.gcore.com//waap/v1/advanced-rules/descriptor", + "/waap/v1/advanced-rules/descriptor", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/waap/custom_page_sets.py b/src/gcore/resources/waap/custom_page_sets.py index 9be46769..7ce6dca4 100644 --- a/src/gcore/resources/waap/custom_page_sets.py +++ b/src/gcore/resources/waap/custom_page_sets.py @@ -88,9 +88,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/waap/v1/custom-page-sets" - if self._client._base_url_overridden - else "https://api.gcore.com//waap/v1/custom-page-sets", + "/waap/v1/custom-page-sets", body=maybe_transform( { "name": name, @@ -154,9 +152,7 @@ def update( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._patch( - f"/waap/v1/custom-page-sets/{set_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/custom-page-sets/{set_id}", + f"/waap/v1/custom-page-sets/{set_id}", body=maybe_transform( { "block": block, @@ -214,9 +210,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/waap/v1/custom-page-sets" - if self._client._base_url_overridden - else "https://api.gcore.com//waap/v1/custom-page-sets", + "/waap/v1/custom-page-sets", page=SyncOffsetPage[WaapCustomPageSet], options=make_request_options( extra_headers=extra_headers, @@ -264,9 +258,7 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/waap/v1/custom-page-sets/{set_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/custom-page-sets/{set_id}", + f"/waap/v1/custom-page-sets/{set_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -299,9 +291,7 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/waap/v1/custom-page-sets/{set_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/custom-page-sets/{set_id}", + f"/waap/v1/custom-page-sets/{set_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -359,9 +349,7 @@ def preview( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - "/waap/v1/preview-custom-page" - if self._client._base_url_overridden - else "https://api.gcore.com//waap/v1/preview-custom-page", + "/waap/v1/preview-custom-page", body=maybe_transform( { "error": error, @@ -442,9 +430,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/waap/v1/custom-page-sets" - if self._client._base_url_overridden - else "https://api.gcore.com//waap/v1/custom-page-sets", + "/waap/v1/custom-page-sets", body=await async_maybe_transform( { "name": name, @@ -508,9 +494,7 @@ async def update( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._patch( - f"/waap/v1/custom-page-sets/{set_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/custom-page-sets/{set_id}", + f"/waap/v1/custom-page-sets/{set_id}", body=await async_maybe_transform( { "block": block, @@ -568,9 +552,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/waap/v1/custom-page-sets" - if self._client._base_url_overridden - else "https://api.gcore.com//waap/v1/custom-page-sets", + "/waap/v1/custom-page-sets", page=AsyncOffsetPage[WaapCustomPageSet], options=make_request_options( extra_headers=extra_headers, @@ -618,9 +600,7 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/waap/v1/custom-page-sets/{set_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/custom-page-sets/{set_id}", + f"/waap/v1/custom-page-sets/{set_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -653,9 +633,7 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/waap/v1/custom-page-sets/{set_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/custom-page-sets/{set_id}", + f"/waap/v1/custom-page-sets/{set_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -713,9 +691,7 @@ async def preview( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - "/waap/v1/preview-custom-page" - if self._client._base_url_overridden - else "https://api.gcore.com//waap/v1/preview-custom-page", + "/waap/v1/preview-custom-page", body=await async_maybe_transform( { "error": error, diff --git a/src/gcore/resources/waap/domains/advanced_rules.py b/src/gcore/resources/waap/domains/advanced_rules.py index 6afde6d6..e22a838f 100644 --- a/src/gcore/resources/waap/domains/advanced_rules.py +++ b/src/gcore/resources/waap/domains/advanced_rules.py @@ -97,9 +97,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - f"/waap/v1/domains/{domain_id}/advanced-rules" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/advanced-rules", + f"/waap/v1/domains/{domain_id}/advanced-rules", body=maybe_transform( { "action": action, @@ -173,9 +171,7 @@ def update( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._patch( - f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/advanced-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}", body=maybe_transform( { "action": action, @@ -265,9 +261,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/advanced-rules" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/advanced-rules", + f"/waap/v1/domains/{domain_id}/advanced-rules", page=SyncOffsetPage[WaapAdvancedRule], options=make_request_options( extra_headers=extra_headers, @@ -321,9 +315,7 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/advanced-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -359,9 +351,7 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/advanced-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -403,9 +393,7 @@ def toggle( raise ValueError(f"Expected a non-empty value for `action` but received {action!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._patch( - f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}/{action}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/advanced-rules/{rule_id}/{action}", + f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}/{action}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -485,9 +473,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - f"/waap/v1/domains/{domain_id}/advanced-rules" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/advanced-rules", + f"/waap/v1/domains/{domain_id}/advanced-rules", body=await async_maybe_transform( { "action": action, @@ -561,9 +547,7 @@ async def update( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._patch( - f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/advanced-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}", body=await async_maybe_transform( { "action": action, @@ -653,9 +637,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/advanced-rules" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/advanced-rules", + f"/waap/v1/domains/{domain_id}/advanced-rules", page=AsyncOffsetPage[WaapAdvancedRule], options=make_request_options( extra_headers=extra_headers, @@ -709,9 +691,7 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/advanced-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -747,9 +727,7 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/advanced-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -791,9 +769,7 @@ async def toggle( raise ValueError(f"Expected a non-empty value for `action` but received {action!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._patch( - f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}/{action}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/advanced-rules/{rule_id}/{action}", + f"/waap/v1/domains/{domain_id}/advanced-rules/{rule_id}/{action}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/waap/domains/api_discovery.py b/src/gcore/resources/waap/domains/api_discovery.py index ccd8a883..6b1f7896 100644 --- a/src/gcore/resources/waap/domains/api_discovery.py +++ b/src/gcore/resources/waap/domains/api_discovery.py @@ -82,9 +82,7 @@ def get_scan_result( if not scan_id: raise ValueError(f"Expected a non-empty value for `scan_id` but received {scan_id!r}") return self._get( - f"/waap/v1/domains/{domain_id}/api-discovery/scan-results/{scan_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-discovery/scan-results/{scan_id}", + f"/waap/v1/domains/{domain_id}/api-discovery/scan-results/{scan_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -117,9 +115,7 @@ def get_settings( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/waap/v1/domains/{domain_id}/api-discovery/settings" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-discovery/settings", + f"/waap/v1/domains/{domain_id}/api-discovery/settings", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -184,9 +180,7 @@ def list_scan_results( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/api-discovery/scan-results" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-discovery/scan-results", + f"/waap/v1/domains/{domain_id}/api-discovery/scan-results", page=SyncOffsetPage[WaapAPIScanResult], options=make_request_options( extra_headers=extra_headers, @@ -237,9 +231,7 @@ def scan_openapi( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - f"/waap/v1/domains/{domain_id}/api-discovery/scan" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-discovery/scan", + f"/waap/v1/domains/{domain_id}/api-discovery/scan", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -289,9 +281,7 @@ def update_settings( timeout: Override the client-level default timeout for this request, in seconds """ return self._patch( - f"/waap/v1/domains/{domain_id}/api-discovery/settings" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-discovery/settings", + f"/waap/v1/domains/{domain_id}/api-discovery/settings", body=maybe_transform( { "description_file_location": description_file_location, @@ -344,9 +334,7 @@ def upload_openapi( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - f"/waap/v1/domains/{domain_id}/api-discovery/upload" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-discovery/upload", + f"/waap/v1/domains/{domain_id}/api-discovery/upload", body=maybe_transform( { "file_data": file_data, @@ -412,9 +400,7 @@ async def get_scan_result( if not scan_id: raise ValueError(f"Expected a non-empty value for `scan_id` but received {scan_id!r}") return await self._get( - f"/waap/v1/domains/{domain_id}/api-discovery/scan-results/{scan_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-discovery/scan-results/{scan_id}", + f"/waap/v1/domains/{domain_id}/api-discovery/scan-results/{scan_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -447,9 +433,7 @@ async def get_settings( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/waap/v1/domains/{domain_id}/api-discovery/settings" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-discovery/settings", + f"/waap/v1/domains/{domain_id}/api-discovery/settings", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -514,9 +498,7 @@ def list_scan_results( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/api-discovery/scan-results" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-discovery/scan-results", + f"/waap/v1/domains/{domain_id}/api-discovery/scan-results", page=AsyncOffsetPage[WaapAPIScanResult], options=make_request_options( extra_headers=extra_headers, @@ -567,9 +549,7 @@ async def scan_openapi( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - f"/waap/v1/domains/{domain_id}/api-discovery/scan" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-discovery/scan", + f"/waap/v1/domains/{domain_id}/api-discovery/scan", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -619,9 +599,7 @@ async def update_settings( timeout: Override the client-level default timeout for this request, in seconds """ return await self._patch( - f"/waap/v1/domains/{domain_id}/api-discovery/settings" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-discovery/settings", + f"/waap/v1/domains/{domain_id}/api-discovery/settings", body=await async_maybe_transform( { "description_file_location": description_file_location, @@ -674,9 +652,7 @@ async def upload_openapi( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - f"/waap/v1/domains/{domain_id}/api-discovery/upload" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-discovery/upload", + f"/waap/v1/domains/{domain_id}/api-discovery/upload", body=await async_maybe_transform( { "file_data": file_data, diff --git a/src/gcore/resources/waap/domains/api_path_groups.py b/src/gcore/resources/waap/domains/api_path_groups.py index cf0c40e5..3e66ea27 100644 --- a/src/gcore/resources/waap/domains/api_path_groups.py +++ b/src/gcore/resources/waap/domains/api_path_groups.py @@ -65,9 +65,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/waap/v1/domains/{domain_id}/api-path-groups" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-path-groups", + f"/waap/v1/domains/{domain_id}/api-path-groups", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -121,9 +119,7 @@ async def list( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/waap/v1/domains/{domain_id}/api-path-groups" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-path-groups", + f"/waap/v1/domains/{domain_id}/api-path-groups", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/waap/domains/api_paths.py b/src/gcore/resources/waap/domains/api_paths.py index d372c33b..fc1dd68c 100644 --- a/src/gcore/resources/waap/domains/api_paths.py +++ b/src/gcore/resources/waap/domains/api_paths.py @@ -90,9 +90,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - f"/waap/v1/domains/{domain_id}/api-paths" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-paths", + f"/waap/v1/domains/{domain_id}/api-paths", body=maybe_transform( { "http_scheme": http_scheme, @@ -155,9 +153,7 @@ def update( raise ValueError(f"Expected a non-empty value for `path_id` but received {path_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._patch( - f"/waap/v1/domains/{domain_id}/api-paths/{path_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-paths/{path_id}", + f"/waap/v1/domains/{domain_id}/api-paths/{path_id}", body=maybe_transform( { "api_groups": api_groups, @@ -254,9 +250,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/api-paths" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-paths", + f"/waap/v1/domains/{domain_id}/api-paths", page=SyncOffsetPage[WaapAPIPath], options=make_request_options( extra_headers=extra_headers, @@ -315,9 +309,7 @@ def delete( raise ValueError(f"Expected a non-empty value for `path_id` but received {path_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/waap/v1/domains/{domain_id}/api-paths/{path_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-paths/{path_id}", + f"/waap/v1/domains/{domain_id}/api-paths/{path_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -355,9 +347,7 @@ def get( if not path_id: raise ValueError(f"Expected a non-empty value for `path_id` but received {path_id!r}") return self._get( - f"/waap/v1/domains/{domain_id}/api-paths/{path_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-paths/{path_id}", + f"/waap/v1/domains/{domain_id}/api-paths/{path_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -430,9 +420,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - f"/waap/v1/domains/{domain_id}/api-paths" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-paths", + f"/waap/v1/domains/{domain_id}/api-paths", body=await async_maybe_transform( { "http_scheme": http_scheme, @@ -495,9 +483,7 @@ async def update( raise ValueError(f"Expected a non-empty value for `path_id` but received {path_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._patch( - f"/waap/v1/domains/{domain_id}/api-paths/{path_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-paths/{path_id}", + f"/waap/v1/domains/{domain_id}/api-paths/{path_id}", body=await async_maybe_transform( { "api_groups": api_groups, @@ -594,9 +580,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/api-paths" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-paths", + f"/waap/v1/domains/{domain_id}/api-paths", page=AsyncOffsetPage[WaapAPIPath], options=make_request_options( extra_headers=extra_headers, @@ -655,9 +639,7 @@ async def delete( raise ValueError(f"Expected a non-empty value for `path_id` but received {path_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/waap/v1/domains/{domain_id}/api-paths/{path_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-paths/{path_id}", + f"/waap/v1/domains/{domain_id}/api-paths/{path_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -695,9 +677,7 @@ async def get( if not path_id: raise ValueError(f"Expected a non-empty value for `path_id` but received {path_id!r}") return await self._get( - f"/waap/v1/domains/{domain_id}/api-paths/{path_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/api-paths/{path_id}", + f"/waap/v1/domains/{domain_id}/api-paths/{path_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/waap/domains/custom_rules.py b/src/gcore/resources/waap/domains/custom_rules.py index adc81b2b..f175a192 100644 --- a/src/gcore/resources/waap/domains/custom_rules.py +++ b/src/gcore/resources/waap/domains/custom_rules.py @@ -92,9 +92,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - f"/waap/v1/domains/{domain_id}/custom-rules" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/custom-rules", + f"/waap/v1/domains/{domain_id}/custom-rules", body=maybe_transform( { "action": action, @@ -157,9 +155,7 @@ def update( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._patch( - f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/custom-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}", body=maybe_transform( { "action": action, @@ -229,9 +225,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/custom-rules" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/custom-rules", + f"/waap/v1/domains/{domain_id}/custom-rules", page=SyncOffsetPage[WaapCustomRule], options=make_request_options( extra_headers=extra_headers, @@ -284,9 +278,7 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/custom-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -323,9 +315,7 @@ def delete_multiple( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - f"/waap/v1/domains/{domain_id}/custom-rules/bulk_delete" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/custom-rules/bulk_delete", + f"/waap/v1/domains/{domain_id}/custom-rules/bulk_delete", body=maybe_transform( {"rule_ids": rule_ids}, custom_rule_delete_multiple_params.CustomRuleDeleteMultipleParams ), @@ -364,9 +354,7 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/custom-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -408,9 +396,7 @@ def toggle( raise ValueError(f"Expected a non-empty value for `action` but received {action!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._patch( - f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}/{action}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/custom-rules/{rule_id}/{action}", + f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}/{action}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -480,9 +466,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - f"/waap/v1/domains/{domain_id}/custom-rules" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/custom-rules", + f"/waap/v1/domains/{domain_id}/custom-rules", body=await async_maybe_transform( { "action": action, @@ -545,9 +529,7 @@ async def update( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._patch( - f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/custom-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}", body=await async_maybe_transform( { "action": action, @@ -617,9 +599,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/custom-rules" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/custom-rules", + f"/waap/v1/domains/{domain_id}/custom-rules", page=AsyncOffsetPage[WaapCustomRule], options=make_request_options( extra_headers=extra_headers, @@ -672,9 +652,7 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/custom-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -711,9 +689,7 @@ async def delete_multiple( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - f"/waap/v1/domains/{domain_id}/custom-rules/bulk_delete" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/custom-rules/bulk_delete", + f"/waap/v1/domains/{domain_id}/custom-rules/bulk_delete", body=await async_maybe_transform( {"rule_ids": rule_ids}, custom_rule_delete_multiple_params.CustomRuleDeleteMultipleParams ), @@ -752,9 +728,7 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/custom-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -796,9 +770,7 @@ async def toggle( raise ValueError(f"Expected a non-empty value for `action` but received {action!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._patch( - f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}/{action}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/custom-rules/{rule_id}/{action}", + f"/waap/v1/domains/{domain_id}/custom-rules/{rule_id}/{action}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/waap/domains/domains.py b/src/gcore/resources/waap/domains/domains.py index 6e0e3bac..cf4135cc 100644 --- a/src/gcore/resources/waap/domains/domains.py +++ b/src/gcore/resources/waap/domains/domains.py @@ -198,9 +198,7 @@ def update( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._patch( - f"/waap/v1/domains/{domain_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}", + f"/waap/v1/domains/{domain_id}", body=maybe_transform({"status": status}, domain_update_params.DomainUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -250,7 +248,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/waap/v1/domains" if self._client._base_url_overridden else "https://api.gcore.com//waap/v1/domains", + "/waap/v1/domains", page=SyncOffsetPage[WaapSummaryDomain], options=make_request_options( extra_headers=extra_headers, @@ -301,9 +299,7 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/waap/v1/domains/{domain_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}", + f"/waap/v1/domains/{domain_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -336,9 +332,7 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/waap/v1/domains/{domain_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}", + f"/waap/v1/domains/{domain_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -371,9 +365,7 @@ def list_rule_sets( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/waap/v1/domains/{domain_id}/rule-sets" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/rule-sets", + f"/waap/v1/domains/{domain_id}/rule-sets", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -411,9 +403,7 @@ def toggle_policy( if not policy_id: raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}") return self._patch( - f"/waap/v1/domains/{domain_id}/policies/{policy_id}/toggle" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/policies/{policy_id}/toggle", + f"/waap/v1/domains/{domain_id}/policies/{policy_id}/toggle", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -511,9 +501,7 @@ async def update( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._patch( - f"/waap/v1/domains/{domain_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}", + f"/waap/v1/domains/{domain_id}", body=await async_maybe_transform({"status": status}, domain_update_params.DomainUpdateParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -563,7 +551,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/waap/v1/domains" if self._client._base_url_overridden else "https://api.gcore.com//waap/v1/domains", + "/waap/v1/domains", page=AsyncOffsetPage[WaapSummaryDomain], options=make_request_options( extra_headers=extra_headers, @@ -614,9 +602,7 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/waap/v1/domains/{domain_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}", + f"/waap/v1/domains/{domain_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -649,9 +635,7 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/waap/v1/domains/{domain_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}", + f"/waap/v1/domains/{domain_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -684,9 +668,7 @@ async def list_rule_sets( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/waap/v1/domains/{domain_id}/rule-sets" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/rule-sets", + f"/waap/v1/domains/{domain_id}/rule-sets", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -724,9 +706,7 @@ async def toggle_policy( if not policy_id: raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}") return await self._patch( - f"/waap/v1/domains/{domain_id}/policies/{policy_id}/toggle" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/policies/{policy_id}/toggle", + f"/waap/v1/domains/{domain_id}/policies/{policy_id}/toggle", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/waap/domains/firewall_rules.py b/src/gcore/resources/waap/domains/firewall_rules.py index bf624cf0..b8600359 100644 --- a/src/gcore/resources/waap/domains/firewall_rules.py +++ b/src/gcore/resources/waap/domains/firewall_rules.py @@ -91,9 +91,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - f"/waap/v1/domains/{domain_id}/firewall-rules" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/firewall-rules", + f"/waap/v1/domains/{domain_id}/firewall-rules", body=maybe_transform( { "action": action, @@ -155,9 +153,7 @@ def update( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._patch( - f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/firewall-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}", body=maybe_transform( { "action": action, @@ -227,9 +223,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/firewall-rules" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/firewall-rules", + f"/waap/v1/domains/{domain_id}/firewall-rules", page=SyncOffsetPage[WaapFirewallRule], options=make_request_options( extra_headers=extra_headers, @@ -282,9 +276,7 @@ def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/firewall-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -321,9 +313,7 @@ def delete_multiple( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._post( - f"/waap/v1/domains/{domain_id}/firewall-rules/bulk_delete" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/firewall-rules/bulk_delete", + f"/waap/v1/domains/{domain_id}/firewall-rules/bulk_delete", body=maybe_transform( {"rule_ids": rule_ids}, firewall_rule_delete_multiple_params.FirewallRuleDeleteMultipleParams ), @@ -362,9 +352,7 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/firewall-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -406,9 +394,7 @@ def toggle( raise ValueError(f"Expected a non-empty value for `action` but received {action!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._patch( - f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}/{action}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/firewall-rules/{rule_id}/{action}", + f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}/{action}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -477,9 +463,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - f"/waap/v1/domains/{domain_id}/firewall-rules" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/firewall-rules", + f"/waap/v1/domains/{domain_id}/firewall-rules", body=await async_maybe_transform( { "action": action, @@ -541,9 +525,7 @@ async def update( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._patch( - f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/firewall-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}", body=await async_maybe_transform( { "action": action, @@ -613,9 +595,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/firewall-rules" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/firewall-rules", + f"/waap/v1/domains/{domain_id}/firewall-rules", page=AsyncOffsetPage[WaapFirewallRule], options=make_request_options( extra_headers=extra_headers, @@ -668,9 +648,7 @@ async def delete( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/firewall-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -707,9 +685,7 @@ async def delete_multiple( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._post( - f"/waap/v1/domains/{domain_id}/firewall-rules/bulk_delete" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/firewall-rules/bulk_delete", + f"/waap/v1/domains/{domain_id}/firewall-rules/bulk_delete", body=await async_maybe_transform( {"rule_ids": rule_ids}, firewall_rule_delete_multiple_params.FirewallRuleDeleteMultipleParams ), @@ -748,9 +724,7 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/firewall-rules/{rule_id}", + f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -792,9 +766,7 @@ async def toggle( raise ValueError(f"Expected a non-empty value for `action` but received {action!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._patch( - f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}/{action}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/firewall-rules/{rule_id}/{action}", + f"/waap/v1/domains/{domain_id}/firewall-rules/{rule_id}/{action}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/waap/domains/insight_silences.py b/src/gcore/resources/waap/domains/insight_silences.py index 98372746..577332e9 100644 --- a/src/gcore/resources/waap/domains/insight_silences.py +++ b/src/gcore/resources/waap/domains/insight_silences.py @@ -93,9 +93,7 @@ def create( timeout: Override the client-level default timeout for this request, in seconds """ return self._post( - f"/waap/v1/domains/{domain_id}/insight-silences" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insight-silences", + f"/waap/v1/domains/{domain_id}/insight-silences", body=maybe_transform( { "author": author, @@ -155,9 +153,7 @@ def update( if not silence_id: raise ValueError(f"Expected a non-empty value for `silence_id` but received {silence_id!r}") return self._patch( - f"/waap/v1/domains/{domain_id}/insight-silences/{silence_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insight-silences/{silence_id}", + f"/waap/v1/domains/{domain_id}/insight-silences/{silence_id}", body=maybe_transform( { "author": author, @@ -232,9 +228,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/insight-silences" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insight-silences", + f"/waap/v1/domains/{domain_id}/insight-silences", page=SyncOffsetPage[WaapInsightSilence], options=make_request_options( extra_headers=extra_headers, @@ -289,9 +283,7 @@ def delete( raise ValueError(f"Expected a non-empty value for `silence_id` but received {silence_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._delete( - f"/waap/v1/domains/{domain_id}/insight-silences/{silence_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insight-silences/{silence_id}", + f"/waap/v1/domains/{domain_id}/insight-silences/{silence_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -329,9 +321,7 @@ def get( if not silence_id: raise ValueError(f"Expected a non-empty value for `silence_id` but received {silence_id!r}") return self._get( - f"/waap/v1/domains/{domain_id}/insight-silences/{silence_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insight-silences/{silence_id}", + f"/waap/v1/domains/{domain_id}/insight-silences/{silence_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -402,9 +392,7 @@ async def create( timeout: Override the client-level default timeout for this request, in seconds """ return await self._post( - f"/waap/v1/domains/{domain_id}/insight-silences" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insight-silences", + f"/waap/v1/domains/{domain_id}/insight-silences", body=await async_maybe_transform( { "author": author, @@ -464,9 +452,7 @@ async def update( if not silence_id: raise ValueError(f"Expected a non-empty value for `silence_id` but received {silence_id!r}") return await self._patch( - f"/waap/v1/domains/{domain_id}/insight-silences/{silence_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insight-silences/{silence_id}", + f"/waap/v1/domains/{domain_id}/insight-silences/{silence_id}", body=await async_maybe_transform( { "author": author, @@ -541,9 +527,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/insight-silences" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insight-silences", + f"/waap/v1/domains/{domain_id}/insight-silences", page=AsyncOffsetPage[WaapInsightSilence], options=make_request_options( extra_headers=extra_headers, @@ -598,9 +582,7 @@ async def delete( raise ValueError(f"Expected a non-empty value for `silence_id` but received {silence_id!r}") extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._delete( - f"/waap/v1/domains/{domain_id}/insight-silences/{silence_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insight-silences/{silence_id}", + f"/waap/v1/domains/{domain_id}/insight-silences/{silence_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -638,9 +620,7 @@ async def get( if not silence_id: raise ValueError(f"Expected a non-empty value for `silence_id` but received {silence_id!r}") return await self._get( - f"/waap/v1/domains/{domain_id}/insight-silences/{silence_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insight-silences/{silence_id}", + f"/waap/v1/domains/{domain_id}/insight-silences/{silence_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/waap/domains/insights.py b/src/gcore/resources/waap/domains/insights.py index 7633f059..8fb4ab52 100644 --- a/src/gcore/resources/waap/domains/insights.py +++ b/src/gcore/resources/waap/domains/insights.py @@ -106,9 +106,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/insights" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insights", + f"/waap/v1/domains/{domain_id}/insights", page=SyncOffsetPage[WaapInsight], options=make_request_options( extra_headers=extra_headers, @@ -160,9 +158,7 @@ def get( if not insight_id: raise ValueError(f"Expected a non-empty value for `insight_id` but received {insight_id!r}") return self._get( - f"/waap/v1/domains/{domain_id}/insights/{insight_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insights/{insight_id}", + f"/waap/v1/domains/{domain_id}/insights/{insight_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -203,9 +199,7 @@ def replace( if not insight_id: raise ValueError(f"Expected a non-empty value for `insight_id` but received {insight_id!r}") return self._put( - f"/waap/v1/domains/{domain_id}/insights/{insight_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insights/{insight_id}", + f"/waap/v1/domains/{domain_id}/insights/{insight_id}", body=maybe_transform({"status": status}, insight_replace_params.InsightReplaceParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout @@ -295,9 +289,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/insights" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insights", + f"/waap/v1/domains/{domain_id}/insights", page=AsyncOffsetPage[WaapInsight], options=make_request_options( extra_headers=extra_headers, @@ -349,9 +341,7 @@ async def get( if not insight_id: raise ValueError(f"Expected a non-empty value for `insight_id` but received {insight_id!r}") return await self._get( - f"/waap/v1/domains/{domain_id}/insights/{insight_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insights/{insight_id}", + f"/waap/v1/domains/{domain_id}/insights/{insight_id}", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -392,9 +382,7 @@ async def replace( if not insight_id: raise ValueError(f"Expected a non-empty value for `insight_id` but received {insight_id!r}") return await self._put( - f"/waap/v1/domains/{domain_id}/insights/{insight_id}" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/insights/{insight_id}", + f"/waap/v1/domains/{domain_id}/insights/{insight_id}", body=await async_maybe_transform({"status": status}, insight_replace_params.InsightReplaceParams), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout diff --git a/src/gcore/resources/waap/domains/settings.py b/src/gcore/resources/waap/domains/settings.py index 17c719c1..fc9cafbf 100644 --- a/src/gcore/resources/waap/domains/settings.py +++ b/src/gcore/resources/waap/domains/settings.py @@ -74,9 +74,7 @@ def update( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return self._patch( - f"/waap/v1/domains/{domain_id}/settings" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/settings", + f"/waap/v1/domains/{domain_id}/settings", body=maybe_transform( { "api": api, @@ -116,9 +114,7 @@ def get( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/waap/v1/domains/{domain_id}/settings" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/settings", + f"/waap/v1/domains/{domain_id}/settings", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -179,9 +175,7 @@ async def update( """ extra_headers = {"Accept": "*/*", **(extra_headers or {})} return await self._patch( - f"/waap/v1/domains/{domain_id}/settings" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/settings", + f"/waap/v1/domains/{domain_id}/settings", body=await async_maybe_transform( { "api": api, @@ -221,9 +215,7 @@ async def get( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/waap/v1/domains/{domain_id}/settings" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/settings", + f"/waap/v1/domains/{domain_id}/settings", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), diff --git a/src/gcore/resources/waap/domains/statistics.py b/src/gcore/resources/waap/domains/statistics.py index 517d55f6..f23b048b 100644 --- a/src/gcore/resources/waap/domains/statistics.py +++ b/src/gcore/resources/waap/domains/statistics.py @@ -98,9 +98,7 @@ def get_ddos_attacks( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/ddos-attacks" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/ddos-attacks", + f"/waap/v1/domains/{domain_id}/ddos-attacks", page=SyncOffsetPage[WaapDDOSAttack], options=make_request_options( extra_headers=extra_headers, @@ -163,9 +161,7 @@ def get_ddos_info( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/ddos-info" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/ddos-info", + f"/waap/v1/domains/{domain_id}/ddos-info", page=SyncOffsetPage[WaapDDOSInfo], options=make_request_options( extra_headers=extra_headers, @@ -231,9 +227,7 @@ def get_events_aggregated( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/waap/v1/domains/{domain_id}/stats" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/stats", + f"/waap/v1/domains/{domain_id}/stats", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -286,9 +280,7 @@ def get_request_details( if not request_id: raise ValueError(f"Expected a non-empty value for `request_id` but received {request_id!r}") return self._get( - f"/waap/v1/domains/{domain_id}/requests/{request_id}/details" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/requests/{request_id}/details", + f"/waap/v1/domains/{domain_id}/requests/{request_id}/details", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -382,9 +374,7 @@ def get_requests_series( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/requests" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/requests", + f"/waap/v1/domains/{domain_id}/requests", page=SyncOffsetPage[WaapRequestSummary], options=make_request_options( extra_headers=extra_headers, @@ -450,9 +440,7 @@ def get_traffic_series( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - f"/waap/v1/domains/{domain_id}/traffic" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/traffic", + f"/waap/v1/domains/{domain_id}/traffic", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -532,9 +520,7 @@ def get_ddos_attacks( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/ddos-attacks" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/ddos-attacks", + f"/waap/v1/domains/{domain_id}/ddos-attacks", page=AsyncOffsetPage[WaapDDOSAttack], options=make_request_options( extra_headers=extra_headers, @@ -597,9 +583,7 @@ def get_ddos_info( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/ddos-info" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/ddos-info", + f"/waap/v1/domains/{domain_id}/ddos-info", page=AsyncOffsetPage[WaapDDOSInfo], options=make_request_options( extra_headers=extra_headers, @@ -665,9 +649,7 @@ async def get_events_aggregated( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/waap/v1/domains/{domain_id}/stats" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/stats", + f"/waap/v1/domains/{domain_id}/stats", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -720,9 +702,7 @@ async def get_request_details( if not request_id: raise ValueError(f"Expected a non-empty value for `request_id` but received {request_id!r}") return await self._get( - f"/waap/v1/domains/{domain_id}/requests/{request_id}/details" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/requests/{request_id}/details", + f"/waap/v1/domains/{domain_id}/requests/{request_id}/details", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -816,9 +796,7 @@ def get_requests_series( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - f"/waap/v1/domains/{domain_id}/requests" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/requests", + f"/waap/v1/domains/{domain_id}/requests", page=AsyncOffsetPage[WaapRequestSummary], options=make_request_options( extra_headers=extra_headers, @@ -884,9 +862,7 @@ async def get_traffic_series( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - f"/waap/v1/domains/{domain_id}/traffic" - if self._client._base_url_overridden - else f"https://api.gcore.com//waap/v1/domains/{domain_id}/traffic", + f"/waap/v1/domains/{domain_id}/traffic", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/waap/insights.py b/src/gcore/resources/waap/insights.py index 0634ffef..e056e67a 100644 --- a/src/gcore/resources/waap/insights.py +++ b/src/gcore/resources/waap/insights.py @@ -88,9 +88,7 @@ def list_types( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/waap/v1/security-insights/types" - if self._client._base_url_overridden - else "https://api.gcore.com//waap/v1/security-insights/types", + "/waap/v1/security-insights/types", page=SyncOffsetPage[WaapInsightType], options=make_request_options( extra_headers=extra_headers, @@ -176,9 +174,7 @@ def list_types( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/waap/v1/security-insights/types" - if self._client._base_url_overridden - else "https://api.gcore.com//waap/v1/security-insights/types", + "/waap/v1/security-insights/types", page=AsyncOffsetPage[WaapInsightType], options=make_request_options( extra_headers=extra_headers, diff --git a/src/gcore/resources/waap/ip_info/ip_info.py b/src/gcore/resources/waap/ip_info/ip_info.py index e1a6fa7c..e721bf7d 100644 --- a/src/gcore/resources/waap/ip_info/ip_info.py +++ b/src/gcore/resources/waap/ip_info/ip_info.py @@ -95,9 +95,7 @@ def get_attack_time_series( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/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", + "/waap/v1/ip-info/attack-time-series", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -144,9 +142,7 @@ def get_blocked_requests( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/waap/v1/ip-info/blocked-requests" - if self._client._base_url_overridden - else "https://api.gcore.com//waap/v1/ip-info/blocked-requests", + "/waap/v1/ip-info/blocked-requests", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -193,9 +189,7 @@ def get_ddos_attack_series( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/waap/v1/ip-info/ddos" - if self._client._base_url_overridden - else "https://api.gcore.com//waap/v1/ip-info/ddos", + "/waap/v1/ip-info/ddos", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -235,9 +229,7 @@ def get_ip_info( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/waap/v1/ip-info/ip-info" - if self._client._base_url_overridden - else "https://api.gcore.com//waap/v1/ip-info/ip-info", + "/waap/v1/ip-info/ip-info", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -282,9 +274,7 @@ def get_top_urls( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/waap/v1/ip-info/top-urls" - if self._client._base_url_overridden - else "https://api.gcore.com//waap/v1/ip-info/top-urls", + "/waap/v1/ip-info/top-urls", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -333,9 +323,7 @@ def get_top_user_agents( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/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", + "/waap/v1/ip-info/top-user-agents", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -384,9 +372,7 @@ def get_top_user_sessions( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/waap/v1/ip-info/top-sessions" - if self._client._base_url_overridden - else "https://api.gcore.com//waap/v1/ip-info/top-sessions", + "/waap/v1/ip-info/top-sessions", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -429,9 +415,7 @@ def list_attacked_countries( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/waap/v1/ip-info/attack-map" - if self._client._base_url_overridden - else "https://api.gcore.com//waap/v1/ip-info/attack-map", + "/waap/v1/ip-info/attack-map", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -495,9 +479,7 @@ async def get_attack_time_series( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/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", + "/waap/v1/ip-info/attack-time-series", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -544,9 +526,7 @@ async def get_blocked_requests( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/waap/v1/ip-info/blocked-requests" - if self._client._base_url_overridden - else "https://api.gcore.com//waap/v1/ip-info/blocked-requests", + "/waap/v1/ip-info/blocked-requests", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -593,9 +573,7 @@ async def get_ddos_attack_series( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/waap/v1/ip-info/ddos" - if self._client._base_url_overridden - else "https://api.gcore.com//waap/v1/ip-info/ddos", + "/waap/v1/ip-info/ddos", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -635,9 +613,7 @@ async def get_ip_info( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/waap/v1/ip-info/ip-info" - if self._client._base_url_overridden - else "https://api.gcore.com//waap/v1/ip-info/ip-info", + "/waap/v1/ip-info/ip-info", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -682,9 +658,7 @@ async def get_top_urls( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/waap/v1/ip-info/top-urls" - if self._client._base_url_overridden - else "https://api.gcore.com//waap/v1/ip-info/top-urls", + "/waap/v1/ip-info/top-urls", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -733,9 +707,7 @@ async def get_top_user_agents( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/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", + "/waap/v1/ip-info/top-user-agents", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -784,9 +756,7 @@ async def get_top_user_sessions( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/waap/v1/ip-info/top-sessions" - if self._client._base_url_overridden - else "https://api.gcore.com//waap/v1/ip-info/top-sessions", + "/waap/v1/ip-info/top-sessions", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -829,9 +799,7 @@ async def list_attacked_countries( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/waap/v1/ip-info/attack-map" - if self._client._base_url_overridden - else "https://api.gcore.com//waap/v1/ip-info/attack-map", + "/waap/v1/ip-info/attack-map", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/waap/ip_info/metrics.py b/src/gcore/resources/waap/ip_info/metrics.py index 32f17c80..c70d3faa 100644 --- a/src/gcore/resources/waap/ip_info/metrics.py +++ b/src/gcore/resources/waap/ip_info/metrics.py @@ -77,9 +77,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/waap/v1/ip-info/counts" - if self._client._base_url_overridden - else "https://api.gcore.com//waap/v1/ip-info/counts", + "/waap/v1/ip-info/counts", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -151,9 +149,7 @@ async def list( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/waap/v1/ip-info/counts" - if self._client._base_url_overridden - else "https://api.gcore.com//waap/v1/ip-info/counts", + "/waap/v1/ip-info/counts", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/waap/organizations.py b/src/gcore/resources/waap/organizations.py index ffe33962..f36dcb35 100644 --- a/src/gcore/resources/waap/organizations.py +++ b/src/gcore/resources/waap/organizations.py @@ -82,9 +82,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/waap/v1/organizations" - if self._client._base_url_overridden - else "https://api.gcore.com//waap/v1/organizations", + "/waap/v1/organizations", page=SyncOffsetPage[WaapOrganization], options=make_request_options( extra_headers=extra_headers, @@ -162,9 +160,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/waap/v1/organizations" - if self._client._base_url_overridden - else "https://api.gcore.com//waap/v1/organizations", + "/waap/v1/organizations", page=AsyncOffsetPage[WaapOrganization], options=make_request_options( extra_headers=extra_headers, diff --git a/src/gcore/resources/waap/statistics.py b/src/gcore/resources/waap/statistics.py index 5f64899e..f8258bab 100644 --- a/src/gcore/resources/waap/statistics.py +++ b/src/gcore/resources/waap/statistics.py @@ -87,9 +87,7 @@ def get_usage_series( timeout: Override the client-level default timeout for this request, in seconds """ return self._get( - "/waap/v1/statistics/series" - if self._client._base_url_overridden - else "https://api.gcore.com//waap/v1/statistics/series", + "/waap/v1/statistics/series", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -171,9 +169,7 @@ async def get_usage_series( timeout: Override the client-level default timeout for this request, in seconds """ return await self._get( - "/waap/v1/statistics/series" - if self._client._base_url_overridden - else "https://api.gcore.com//waap/v1/statistics/series", + "/waap/v1/statistics/series", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, diff --git a/src/gcore/resources/waap/tags.py b/src/gcore/resources/waap/tags.py index f2ced3d7..df171560 100644 --- a/src/gcore/resources/waap/tags.py +++ b/src/gcore/resources/waap/tags.py @@ -88,7 +88,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/waap/v1/tags" if self._client._base_url_overridden else "https://api.gcore.com//waap/v1/tags", + "/waap/v1/tags", page=SyncOffsetPage[WaapTag], options=make_request_options( extra_headers=extra_headers, @@ -174,7 +174,7 @@ def list( timeout: Override the client-level default timeout for this request, in seconds """ return self._get_api_list( - "/waap/v1/tags" if self._client._base_url_overridden else "https://api.gcore.com//waap/v1/tags", + "/waap/v1/tags", page=AsyncOffsetPage[WaapTag], options=make_request_options( extra_headers=extra_headers, diff --git a/src/gcore/resources/waap/waap.py b/src/gcore/resources/waap/waap.py index 4f621d4e..3d68c41f 100644 --- a/src/gcore/resources/waap/waap.py +++ b/src/gcore/resources/waap/waap.py @@ -147,7 +147,7 @@ def get_account_overview( ) -> WaapGetAccountOverviewResponse: """Get information about WAAP service for the client""" return self._get( - "/waap/v1/clients/me" if self._client._base_url_overridden else "https://api.gcore.com//waap/v1/clients/me", + "/waap/v1/clients/me", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), @@ -219,7 +219,7 @@ async def get_account_overview( ) -> WaapGetAccountOverviewResponse: """Get information about WAAP service for the client""" return await self._get( - "/waap/v1/clients/me" if self._client._base_url_overridden else "https://api.gcore.com//waap/v1/clients/me", + "/waap/v1/clients/me", options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), From 3861559d205d06ceb7a1ff6f1a00184c785314cd Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Mon, 15 Sep 2025 10:11:08 +0000 Subject: [PATCH 09/16] codegen metadata --- .stats.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.stats.yml b/.stats.yml index a8e94942..710ee8c8 100644 --- a/.stats.yml +++ b/.stats.yml @@ -1,4 +1,4 @@ configured_endpoints: 523 -openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/gcore%2Fgcore-41a0bfcc37b5bb42a72fc8a83fd2206024930816e6ae11496b66be03436db20c.yml -openapi_spec_hash: 6d1a8bbafd395b9cb8caa31890a4b0bc +openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/gcore%2Fgcore-895dff64a4fa6d606c244d55ff0e53446c580eaa1df3b1589a2d5087ebebaf49.yml +openapi_spec_hash: d8c1b66c7165f1f896dfd0ddeb8f9d3e config_hash: 28b1157595821f9f0eb3e9f3ea690703 From 44f913dec0b8b350c681816c857e5dfb7705104b Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Tue, 16 Sep 2025 04:04:22 +0000 Subject: [PATCH 10/16] codegen metadata --- .stats.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.stats.yml b/.stats.yml index 710ee8c8..4957dddd 100644 --- a/.stats.yml +++ b/.stats.yml @@ -1,4 +1,4 @@ configured_endpoints: 523 openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/gcore%2Fgcore-895dff64a4fa6d606c244d55ff0e53446c580eaa1df3b1589a2d5087ebebaf49.yml openapi_spec_hash: d8c1b66c7165f1f896dfd0ddeb8f9d3e -config_hash: 28b1157595821f9f0eb3e9f3ea690703 +config_hash: 028fbcd5b4de4521ae051c04cf50d217 From 88d012b0ac0dc0d426ca74bee070a8002780e90e Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Tue, 16 Sep 2025 04:25:52 +0000 Subject: [PATCH 11/16] codegen metadata --- .stats.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.stats.yml b/.stats.yml index 4957dddd..8e0edbcc 100644 --- a/.stats.yml +++ b/.stats.yml @@ -1,4 +1,4 @@ configured_endpoints: 523 openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/gcore%2Fgcore-895dff64a4fa6d606c244d55ff0e53446c580eaa1df3b1589a2d5087ebebaf49.yml openapi_spec_hash: d8c1b66c7165f1f896dfd0ddeb8f9d3e -config_hash: 028fbcd5b4de4521ae051c04cf50d217 +config_hash: 54cc733438deaab24435d7c4226f02d7 From ff00e5ab5a42d60a2626e4fbf35df2acde98e5a1 Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Tue, 16 Sep 2025 06:13:14 +0000 Subject: [PATCH 12/16] codegen metadata --- .stats.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.stats.yml b/.stats.yml index 8e0edbcc..f153347f 100644 --- a/.stats.yml +++ b/.stats.yml @@ -1,4 +1,4 @@ configured_endpoints: 523 -openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/gcore%2Fgcore-895dff64a4fa6d606c244d55ff0e53446c580eaa1df3b1589a2d5087ebebaf49.yml -openapi_spec_hash: d8c1b66c7165f1f896dfd0ddeb8f9d3e +openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/gcore%2Fgcore-e7516303f903fe1c8f61ff65cf87e17eab9417800b0592277e00aaeac8c8a658.yml +openapi_spec_hash: f4070c11c3c295565ec28aea7f8f6058 config_hash: 54cc733438deaab24435d7c4226f02d7 From 295499000a8e2b1ef24ae497cb34fafbf38f2149 Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Tue, 16 Sep 2025 08:03:17 +0000 Subject: [PATCH 13/16] feat(api): aggregated API specs update --- .stats.yml | 6 +- api.md | 2 - src/gcore/resources/dns/zones/zones.py | 83 ------------------- src/gcore/types/dns/__init__.py | 4 - src/gcore/types/dns/dns_name_server.py | 17 ---- .../zone_check_delegation_status_response.py | 20 ----- tests/api_resources/dns/test_zones.py | 77 ----------------- 7 files changed, 3 insertions(+), 206 deletions(-) delete mode 100644 src/gcore/types/dns/dns_name_server.py delete mode 100644 src/gcore/types/dns/zone_check_delegation_status_response.py diff --git a/.stats.yml b/.stats.yml index f153347f..28c67d19 100644 --- a/.stats.yml +++ b/.stats.yml @@ -1,4 +1,4 @@ -configured_endpoints: 523 -openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/gcore%2Fgcore-e7516303f903fe1c8f61ff65cf87e17eab9417800b0592277e00aaeac8c8a658.yml -openapi_spec_hash: f4070c11c3c295565ec28aea7f8f6058 +configured_endpoints: 522 +openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/gcore%2Fgcore-3721d496395e684887e9ba0386375910a4fe68253893ccfce4e79c2e8a5b84af.yml +openapi_spec_hash: f95b9f70ed1b3b8230ef3a092c6acedd config_hash: 54cc733438deaab24435d7c4226f02d7 diff --git a/api.md b/api.md index 813dbe4c..8bddc6dc 100644 --- a/api.md +++ b/api.md @@ -1920,7 +1920,6 @@ from gcore.types.dns import ( DNSNameServer, ZoneCreateResponse, ZoneListResponse, - ZoneCheckDelegationStatusResponse, ZoneExportResponse, ZoneGetResponse, ZoneGetStatisticsResponse, @@ -1933,7 +1932,6 @@ Methods: - client.dns.zones.create(\*\*params) -> ZoneCreateResponse - client.dns.zones.list(\*\*params) -> ZoneListResponse - client.dns.zones.delete(name) -> object -- client.dns.zones.check_delegation_status(name) -> ZoneCheckDelegationStatusResponse - client.dns.zones.disable(name) -> object - client.dns.zones.enable(name) -> object - client.dns.zones.export(zone_name) -> ZoneExportResponse diff --git a/src/gcore/resources/dns/zones/zones.py b/src/gcore/resources/dns/zones/zones.py index 75e11dde..e5ab591d 100644 --- a/src/gcore/resources/dns/zones/zones.py +++ b/src/gcore/resources/dns/zones/zones.py @@ -48,7 +48,6 @@ from ....types.dns.zone_export_response import ZoneExportResponse from ....types.dns.zone_import_response import ZoneImportResponse from ....types.dns.zone_get_statistics_response import ZoneGetStatisticsResponse -from ....types.dns.zone_check_delegation_status_response import ZoneCheckDelegationStatusResponse __all__ = ["ZonesResource", "AsyncZonesResource"] @@ -290,41 +289,6 @@ def delete( cast_to=object, ) - def check_delegation_status( - self, - name: str, - *, - # 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, - ) -> ZoneCheckDelegationStatusResponse: - """Returns delegation status for specified domain name. - - This endpoint has rate - limit. - - Args: - extra_headers: Send extra headers - - extra_query: Add additional query parameters to the request - - extra_body: Add additional JSON properties to the request - - timeout: Override the client-level default timeout for this request, in seconds - """ - if not name: - raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") - return self._post( - f"/dns/v2/analyze/{name}/delegation-status", - options=make_request_options( - extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout - ), - cast_to=ZoneCheckDelegationStatusResponse, - ) - def disable( self, name: str, @@ -916,41 +880,6 @@ async def delete( cast_to=object, ) - async def check_delegation_status( - self, - name: str, - *, - # 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, - ) -> ZoneCheckDelegationStatusResponse: - """Returns delegation status for specified domain name. - - This endpoint has rate - limit. - - Args: - extra_headers: Send extra headers - - extra_query: Add additional query parameters to the request - - extra_body: Add additional JSON properties to the request - - timeout: Override the client-level default timeout for this request, in seconds - """ - if not name: - raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") - return await self._post( - f"/dns/v2/analyze/{name}/delegation-status", - options=make_request_options( - extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout - ), - cast_to=ZoneCheckDelegationStatusResponse, - ) - async def disable( self, name: str, @@ -1318,9 +1247,6 @@ def __init__(self, zones: ZonesResource) -> None: self.delete = to_raw_response_wrapper( zones.delete, ) - self.check_delegation_status = to_raw_response_wrapper( - zones.check_delegation_status, - ) self.disable = to_raw_response_wrapper( zones.disable, ) @@ -1365,9 +1291,6 @@ def __init__(self, zones: AsyncZonesResource) -> None: self.delete = async_to_raw_response_wrapper( zones.delete, ) - self.check_delegation_status = async_to_raw_response_wrapper( - zones.check_delegation_status, - ) self.disable = async_to_raw_response_wrapper( zones.disable, ) @@ -1412,9 +1335,6 @@ def __init__(self, zones: ZonesResource) -> None: self.delete = to_streamed_response_wrapper( zones.delete, ) - self.check_delegation_status = to_streamed_response_wrapper( - zones.check_delegation_status, - ) self.disable = to_streamed_response_wrapper( zones.disable, ) @@ -1459,9 +1379,6 @@ def __init__(self, zones: AsyncZonesResource) -> None: self.delete = async_to_streamed_response_wrapper( zones.delete, ) - self.check_delegation_status = async_to_streamed_response_wrapper( - zones.check_delegation_status, - ) self.disable = async_to_streamed_response_wrapper( zones.disable, ) diff --git a/src/gcore/types/dns/__init__.py b/src/gcore/types/dns/__init__.py index f72384a3..e41ca78e 100644 --- a/src/gcore/types/dns/__init__.py +++ b/src/gcore/types/dns/__init__.py @@ -3,7 +3,6 @@ from __future__ import annotations from .dns_label_name import DNSLabelName as DNSLabelName -from .dns_name_server import DNSNameServer as DNSNameServer from .zone_list_params import ZoneListParams as ZoneListParams from .dns_lookup_params import DNSLookupParams as DNSLookupParams from .zone_get_response import ZoneGetResponse as ZoneGetResponse @@ -26,6 +25,3 @@ from .location_list_countries_response import LocationListCountriesResponse as LocationListCountriesResponse from .dns_get_account_overview_response import DNSGetAccountOverviewResponse as DNSGetAccountOverviewResponse from .location_list_continents_response import LocationListContinentsResponse as LocationListContinentsResponse -from .zone_check_delegation_status_response import ( - ZoneCheckDelegationStatusResponse as ZoneCheckDelegationStatusResponse, -) diff --git a/src/gcore/types/dns/dns_name_server.py b/src/gcore/types/dns/dns_name_server.py deleted file mode 100644 index 619c4943..00000000 --- a/src/gcore/types/dns/dns_name_server.py +++ /dev/null @@ -1,17 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing import List, Optional - -from pydantic import Field as FieldInfo - -from ..._models import BaseModel - -__all__ = ["DNSNameServer"] - - -class DNSNameServer(BaseModel): - ipv4_addresses: Optional[List[str]] = FieldInfo(alias="ipv4Addresses", default=None) - - ipv6_addresses: Optional[List[str]] = FieldInfo(alias="ipv6Addresses", default=None) - - name: Optional[str] = None diff --git a/src/gcore/types/dns/zone_check_delegation_status_response.py b/src/gcore/types/dns/zone_check_delegation_status_response.py deleted file mode 100644 index ae89139a..00000000 --- a/src/gcore/types/dns/zone_check_delegation_status_response.py +++ /dev/null @@ -1,20 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing import List, Optional - -from ..._models import BaseModel -from .dns_name_server import DNSNameServer - -__all__ = ["ZoneCheckDelegationStatusResponse"] - - -class ZoneCheckDelegationStatusResponse(BaseModel): - authoritative_name_servers: Optional[List[DNSNameServer]] = None - - gcore_authorized_count: Optional[int] = None - - is_whitelabel_delegation: Optional[bool] = None - - non_gcore_authorized_count: Optional[int] = None - - zone_exists: Optional[bool] = None diff --git a/tests/api_resources/dns/test_zones.py b/tests/api_resources/dns/test_zones.py index cdb8d744..466834c7 100644 --- a/tests/api_resources/dns/test_zones.py +++ b/tests/api_resources/dns/test_zones.py @@ -17,7 +17,6 @@ ZoneExportResponse, ZoneImportResponse, ZoneGetStatisticsResponse, - ZoneCheckDelegationStatusResponse, ) base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -159,44 +158,6 @@ def test_path_params_delete(self, client: Gcore) -> None: "", ) - @parametrize - def test_method_check_delegation_status(self, client: Gcore) -> None: - zone = client.dns.zones.check_delegation_status( - "name", - ) - assert_matches_type(ZoneCheckDelegationStatusResponse, zone, path=["response"]) - - @parametrize - def test_raw_response_check_delegation_status(self, client: Gcore) -> None: - response = client.dns.zones.with_raw_response.check_delegation_status( - "name", - ) - - assert response.is_closed is True - assert response.http_request.headers.get("X-Stainless-Lang") == "python" - zone = response.parse() - assert_matches_type(ZoneCheckDelegationStatusResponse, zone, path=["response"]) - - @parametrize - def test_streaming_response_check_delegation_status(self, client: Gcore) -> None: - with client.dns.zones.with_streaming_response.check_delegation_status( - "name", - ) as response: - assert not response.is_closed - assert response.http_request.headers.get("X-Stainless-Lang") == "python" - - zone = response.parse() - assert_matches_type(ZoneCheckDelegationStatusResponse, zone, path=["response"]) - - assert cast(Any, response.is_closed) is True - - @parametrize - def test_path_params_check_delegation_status(self, client: Gcore) -> None: - with pytest.raises(ValueError, match=r"Expected a non-empty value for `name` but received ''"): - client.dns.zones.with_raw_response.check_delegation_status( - "", - ) - @parametrize def test_method_disable(self, client: Gcore) -> None: zone = client.dns.zones.disable( @@ -642,44 +603,6 @@ async def test_path_params_delete(self, async_client: AsyncGcore) -> None: "", ) - @parametrize - async def test_method_check_delegation_status(self, async_client: AsyncGcore) -> None: - zone = await async_client.dns.zones.check_delegation_status( - "name", - ) - assert_matches_type(ZoneCheckDelegationStatusResponse, zone, path=["response"]) - - @parametrize - async def test_raw_response_check_delegation_status(self, async_client: AsyncGcore) -> None: - response = await async_client.dns.zones.with_raw_response.check_delegation_status( - "name", - ) - - assert response.is_closed is True - assert response.http_request.headers.get("X-Stainless-Lang") == "python" - zone = await response.parse() - assert_matches_type(ZoneCheckDelegationStatusResponse, zone, path=["response"]) - - @parametrize - async def test_streaming_response_check_delegation_status(self, async_client: AsyncGcore) -> None: - async with async_client.dns.zones.with_streaming_response.check_delegation_status( - "name", - ) as response: - assert not response.is_closed - assert response.http_request.headers.get("X-Stainless-Lang") == "python" - - zone = await response.parse() - assert_matches_type(ZoneCheckDelegationStatusResponse, zone, path=["response"]) - - assert cast(Any, response.is_closed) is True - - @parametrize - async def test_path_params_check_delegation_status(self, async_client: AsyncGcore) -> None: - with pytest.raises(ValueError, match=r"Expected a non-empty value for `name` but received ''"): - await async_client.dns.zones.with_raw_response.check_delegation_status( - "", - ) - @parametrize async def test_method_disable(self, async_client: AsyncGcore) -> None: zone = await async_client.dns.zones.disable( From 28a888260878577e697004da02077ef96a8616ad Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Tue, 16 Sep 2025 08:29:12 +0000 Subject: [PATCH 14/16] feat(cloud): support floating IPs update --- .stats.yml | 4 +- api.md | 1 + src/gcore/resources/cloud/floating_ips.py | 154 +++++++++++++++++- src/gcore/types/cloud/__init__.py | 1 + .../types/cloud/floating_ip_update_params.py | 41 +++++ .../api_resources/cloud/test_floating_ips.py | 112 +++++++++++++ 6 files changed, 310 insertions(+), 3 deletions(-) create mode 100644 src/gcore/types/cloud/floating_ip_update_params.py diff --git a/.stats.yml b/.stats.yml index 28c67d19..e7c17a4a 100644 --- a/.stats.yml +++ b/.stats.yml @@ -1,4 +1,4 @@ -configured_endpoints: 522 +configured_endpoints: 523 openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/gcore%2Fgcore-3721d496395e684887e9ba0386375910a4fe68253893ccfce4e79c2e8a5b84af.yml openapi_spec_hash: f95b9f70ed1b3b8230ef3a092c6acedd -config_hash: 54cc733438deaab24435d7c4226f02d7 +config_hash: b0843ba896a2b11b93b1e2f7088fd0c6 diff --git a/api.md b/api.md index 8bddc6dc..1488d6ea 100644 --- a/api.md +++ b/api.md @@ -397,6 +397,7 @@ from gcore.types.cloud import FloatingIPDetailed Methods: - client.cloud.floating_ips.create(\*, project_id, region_id, \*\*params) -> TaskIDList +- client.cloud.floating_ips.update(floating_ip_id, \*, project_id, region_id, \*\*params) -> FloatingIP - client.cloud.floating_ips.list(\*, project_id, region_id, \*\*params) -> SyncOffsetPage[FloatingIPDetailed] - client.cloud.floating_ips.delete(floating_ip_id, \*, project_id, region_id) -> TaskIDList - client.cloud.floating_ips.assign(floating_ip_id, \*, project_id, region_id, \*\*params) -> FloatingIP diff --git a/src/gcore/resources/cloud/floating_ips.py b/src/gcore/resources/cloud/floating_ips.py index fe0fb27b..1ed214df 100644 --- a/src/gcore/resources/cloud/floating_ips.py +++ b/src/gcore/resources/cloud/floating_ips.py @@ -17,11 +17,17 @@ async_to_streamed_response_wrapper, ) from ...pagination import SyncOffsetPage, AsyncOffsetPage -from ...types.cloud import floating_ip_list_params, floating_ip_assign_params, floating_ip_create_params +from ...types.cloud import ( + floating_ip_list_params, + floating_ip_assign_params, + floating_ip_create_params, + floating_ip_update_params, +) from ..._base_client import AsyncPaginator, make_request_options from ...types.cloud.floating_ip import FloatingIP from ...types.cloud.task_id_list import TaskIDList from ...types.cloud.floating_ip_detailed import FloatingIPDetailed +from ...types.cloud.tag_update_map_param import TagUpdateMapParam __all__ = ["FloatingIPsResource", "AsyncFloatingIPsResource"] @@ -109,6 +115,73 @@ def create( cast_to=TaskIDList, ) + def update( + self, + floating_ip_id: str, + *, + project_id: int | None = None, + region_id: int | None = None, + tags: Optional[TagUpdateMapParam] | 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. + extra_headers: Headers | None = None, + extra_query: Query | None = None, + extra_body: Body | None = None, + timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, + ) -> FloatingIP: + """ + Update floating IP + + Args: + project_id: Project ID + + region_id: Region ID + + floating_ip_id: Floating IP ID + + tags: Update key-value tags using JSON Merge Patch semantics (RFC 7386). Provide + key-value pairs to add or update tags. Set tag values to `null` to remove tags. + Unspecified tags remain unchanged. Read-only tags are always preserved and + cannot be modified. **Examples:** + + - **Add/update tags:** + `{'tags': {'environment': 'production', 'team': 'backend'}}` adds new tags or + updates existing ones. + - **Delete tags:** `{'tags': {'`old_tag`': null}}` removes specific tags. + - **Remove all tags:** `{'tags': null}` removes all user-managed tags (read-only + tags are preserved). + - **Partial update:** `{'tags': {'environment': 'staging'}}` only updates + specified tags. + - **Mixed operations:** + `{'tags': {'environment': 'production', '`cost_center`': 'engineering', '`deprecated_tag`': null}}` + adds/updates 'environment' and '`cost_center`' while removing + '`deprecated_tag`', preserving other existing tags. + - **Replace all:** first delete existing tags with null values, then add new + ones in the same request. + + extra_headers: Send extra headers + + extra_query: Add additional query parameters to the request + + extra_body: Add additional JSON properties to the request + + timeout: Override the client-level default timeout for this request, in seconds + """ + if project_id is None: + project_id = self._client._get_cloud_project_id_path_param() + if region_id is None: + region_id = self._client._get_cloud_region_id_path_param() + if not floating_ip_id: + raise ValueError(f"Expected a non-empty value for `floating_ip_id` but received {floating_ip_id!r}") + return self._patch( + f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}", + body=maybe_transform({"tags": tags}, floating_ip_update_params.FloatingIPUpdateParams), + options=make_request_options( + extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout + ), + cast_to=FloatingIP, + ) + def list( self, *, @@ -524,6 +597,73 @@ async def create( cast_to=TaskIDList, ) + async def update( + self, + floating_ip_id: str, + *, + project_id: int | None = None, + region_id: int | None = None, + tags: Optional[TagUpdateMapParam] | 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. + extra_headers: Headers | None = None, + extra_query: Query | None = None, + extra_body: Body | None = None, + timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, + ) -> FloatingIP: + """ + Update floating IP + + Args: + project_id: Project ID + + region_id: Region ID + + floating_ip_id: Floating IP ID + + tags: Update key-value tags using JSON Merge Patch semantics (RFC 7386). Provide + key-value pairs to add or update tags. Set tag values to `null` to remove tags. + Unspecified tags remain unchanged. Read-only tags are always preserved and + cannot be modified. **Examples:** + + - **Add/update tags:** + `{'tags': {'environment': 'production', 'team': 'backend'}}` adds new tags or + updates existing ones. + - **Delete tags:** `{'tags': {'`old_tag`': null}}` removes specific tags. + - **Remove all tags:** `{'tags': null}` removes all user-managed tags (read-only + tags are preserved). + - **Partial update:** `{'tags': {'environment': 'staging'}}` only updates + specified tags. + - **Mixed operations:** + `{'tags': {'environment': 'production', '`cost_center`': 'engineering', '`deprecated_tag`': null}}` + adds/updates 'environment' and '`cost_center`' while removing + '`deprecated_tag`', preserving other existing tags. + - **Replace all:** first delete existing tags with null values, then add new + ones in the same request. + + extra_headers: Send extra headers + + extra_query: Add additional query parameters to the request + + extra_body: Add additional JSON properties to the request + + timeout: Override the client-level default timeout for this request, in seconds + """ + if project_id is None: + project_id = self._client._get_cloud_project_id_path_param() + if region_id is None: + region_id = self._client._get_cloud_region_id_path_param() + if not floating_ip_id: + raise ValueError(f"Expected a non-empty value for `floating_ip_id` but received {floating_ip_id!r}") + return await self._patch( + f"/cloud/v1/floatingips/{project_id}/{region_id}/{floating_ip_id}", + body=await async_maybe_transform({"tags": tags}, floating_ip_update_params.FloatingIPUpdateParams), + options=make_request_options( + extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout + ), + cast_to=FloatingIP, + ) + def list( self, *, @@ -863,6 +1003,9 @@ def __init__(self, floating_ips: FloatingIPsResource) -> None: self.create = to_raw_response_wrapper( floating_ips.create, ) + self.update = to_raw_response_wrapper( + floating_ips.update, + ) self.list = to_raw_response_wrapper( floating_ips.list, ) @@ -893,6 +1036,9 @@ def __init__(self, floating_ips: AsyncFloatingIPsResource) -> None: self.create = async_to_raw_response_wrapper( floating_ips.create, ) + self.update = async_to_raw_response_wrapper( + floating_ips.update, + ) self.list = async_to_raw_response_wrapper( floating_ips.list, ) @@ -923,6 +1069,9 @@ def __init__(self, floating_ips: FloatingIPsResource) -> None: self.create = to_streamed_response_wrapper( floating_ips.create, ) + self.update = to_streamed_response_wrapper( + floating_ips.update, + ) self.list = to_streamed_response_wrapper( floating_ips.list, ) @@ -953,6 +1102,9 @@ def __init__(self, floating_ips: AsyncFloatingIPsResource) -> None: self.create = async_to_streamed_response_wrapper( floating_ips.create, ) + self.update = async_to_streamed_response_wrapper( + floating_ips.update, + ) self.list = async_to_streamed_response_wrapper( floating_ips.list, ) diff --git a/src/gcore/types/cloud/__init__.py b/src/gcore/types/cloud/__init__.py index 586c4473..21972950 100644 --- a/src/gcore/types/cloud/__init__.py +++ b/src/gcore/types/cloud/__init__.py @@ -122,6 +122,7 @@ from .load_balancer_statistics import LoadBalancerStatistics as LoadBalancerStatistics from .floating_ip_assign_params import FloatingIPAssignParams as FloatingIPAssignParams from .floating_ip_create_params import FloatingIPCreateParams as FloatingIPCreateParams +from .floating_ip_update_params import FloatingIPUpdateParams as FloatingIPUpdateParams from .inference_region_capacity import InferenceRegionCapacity as InferenceRegionCapacity from .load_balancer_flavor_list import LoadBalancerFlavorList as LoadBalancerFlavorList from .load_balancer_list_params import LoadBalancerListParams as LoadBalancerListParams diff --git a/src/gcore/types/cloud/floating_ip_update_params.py b/src/gcore/types/cloud/floating_ip_update_params.py new file mode 100644 index 00000000..79377f4b --- /dev/null +++ b/src/gcore/types/cloud/floating_ip_update_params.py @@ -0,0 +1,41 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from __future__ import annotations + +from typing import Optional +from typing_extensions import TypedDict + +from .tag_update_map_param import TagUpdateMapParam + +__all__ = ["FloatingIPUpdateParams"] + + +class FloatingIPUpdateParams(TypedDict, total=False): + project_id: int + """Project ID""" + + region_id: int + """Region ID""" + + tags: Optional[TagUpdateMapParam] + """Update key-value tags using JSON Merge Patch semantics (RFC 7386). + + Provide key-value pairs to add or update tags. Set tag values to `null` to + remove tags. Unspecified tags remain unchanged. Read-only tags are always + preserved and cannot be modified. **Examples:** + + - **Add/update tags:** + `{'tags': {'environment': 'production', 'team': 'backend'}}` adds new tags or + updates existing ones. + - **Delete tags:** `{'tags': {'`old_tag`': null}}` removes specific tags. + - **Remove all tags:** `{'tags': null}` removes all user-managed tags (read-only + tags are preserved). + - **Partial update:** `{'tags': {'environment': 'staging'}}` only updates + specified tags. + - **Mixed operations:** + `{'tags': {'environment': 'production', '`cost_center`': 'engineering', '`deprecated_tag`': null}}` + adds/updates 'environment' and '`cost_center`' while removing + '`deprecated_tag`', preserving other existing tags. + - **Replace all:** first delete existing tags with null values, then add new + ones in the same request. + """ diff --git a/tests/api_resources/cloud/test_floating_ips.py b/tests/api_resources/cloud/test_floating_ips.py index 70598a35..4b31820b 100644 --- a/tests/api_resources/cloud/test_floating_ips.py +++ b/tests/api_resources/cloud/test_floating_ips.py @@ -67,6 +67,62 @@ def test_streaming_response_create(self, client: Gcore) -> None: assert cast(Any, response.is_closed) is True + @parametrize + def test_method_update(self, client: Gcore) -> None: + floating_ip = client.cloud.floating_ips.update( + floating_ip_id="c64e5db1-5f1f-43ec-a8d9-5090df85b82d", + project_id=1, + region_id=1, + ) + assert_matches_type(FloatingIP, floating_ip, path=["response"]) + + @parametrize + def test_method_update_with_all_params(self, client: Gcore) -> None: + floating_ip = client.cloud.floating_ips.update( + floating_ip_id="c64e5db1-5f1f-43ec-a8d9-5090df85b82d", + project_id=1, + region_id=1, + tags={"foo": "my-tag-value"}, + ) + assert_matches_type(FloatingIP, floating_ip, path=["response"]) + + @parametrize + def test_raw_response_update(self, client: Gcore) -> None: + response = client.cloud.floating_ips.with_raw_response.update( + floating_ip_id="c64e5db1-5f1f-43ec-a8d9-5090df85b82d", + project_id=1, + region_id=1, + ) + + assert response.is_closed is True + assert response.http_request.headers.get("X-Stainless-Lang") == "python" + floating_ip = response.parse() + assert_matches_type(FloatingIP, floating_ip, path=["response"]) + + @parametrize + def test_streaming_response_update(self, client: Gcore) -> None: + with client.cloud.floating_ips.with_streaming_response.update( + floating_ip_id="c64e5db1-5f1f-43ec-a8d9-5090df85b82d", + project_id=1, + region_id=1, + ) as response: + assert not response.is_closed + assert response.http_request.headers.get("X-Stainless-Lang") == "python" + + floating_ip = response.parse() + assert_matches_type(FloatingIP, floating_ip, path=["response"]) + + assert cast(Any, response.is_closed) is True + + @parametrize + def test_path_params_update(self, client: Gcore) -> None: + with pytest.raises(ValueError, match=r"Expected a non-empty value for `floating_ip_id` but received ''"): + client.cloud.floating_ips.with_raw_response.update( + floating_ip_id="", + project_id=1, + region_id=1, + ) + @parametrize def test_method_list(self, client: Gcore) -> None: floating_ip = client.cloud.floating_ips.list( @@ -363,6 +419,62 @@ async def test_streaming_response_create(self, async_client: AsyncGcore) -> None assert cast(Any, response.is_closed) is True + @parametrize + async def test_method_update(self, async_client: AsyncGcore) -> None: + floating_ip = await async_client.cloud.floating_ips.update( + floating_ip_id="c64e5db1-5f1f-43ec-a8d9-5090df85b82d", + project_id=1, + region_id=1, + ) + assert_matches_type(FloatingIP, floating_ip, path=["response"]) + + @parametrize + async def test_method_update_with_all_params(self, async_client: AsyncGcore) -> None: + floating_ip = await async_client.cloud.floating_ips.update( + floating_ip_id="c64e5db1-5f1f-43ec-a8d9-5090df85b82d", + project_id=1, + region_id=1, + tags={"foo": "my-tag-value"}, + ) + assert_matches_type(FloatingIP, floating_ip, path=["response"]) + + @parametrize + async def test_raw_response_update(self, async_client: AsyncGcore) -> None: + response = await async_client.cloud.floating_ips.with_raw_response.update( + floating_ip_id="c64e5db1-5f1f-43ec-a8d9-5090df85b82d", + project_id=1, + region_id=1, + ) + + assert response.is_closed is True + assert response.http_request.headers.get("X-Stainless-Lang") == "python" + floating_ip = await response.parse() + assert_matches_type(FloatingIP, floating_ip, path=["response"]) + + @parametrize + async def test_streaming_response_update(self, async_client: AsyncGcore) -> None: + async with async_client.cloud.floating_ips.with_streaming_response.update( + floating_ip_id="c64e5db1-5f1f-43ec-a8d9-5090df85b82d", + project_id=1, + region_id=1, + ) as response: + assert not response.is_closed + assert response.http_request.headers.get("X-Stainless-Lang") == "python" + + floating_ip = await response.parse() + assert_matches_type(FloatingIP, floating_ip, path=["response"]) + + assert cast(Any, response.is_closed) is True + + @parametrize + async def test_path_params_update(self, async_client: AsyncGcore) -> None: + with pytest.raises(ValueError, match=r"Expected a non-empty value for `floating_ip_id` but received ''"): + await async_client.cloud.floating_ips.with_raw_response.update( + floating_ip_id="", + project_id=1, + region_id=1, + ) + @parametrize async def test_method_list(self, async_client: AsyncGcore) -> None: floating_ip = await async_client.cloud.floating_ips.list( From ddd12bd4782b8883d82b97a45d043ad3970ee31a Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Tue, 16 Sep 2025 13:15:37 +0000 Subject: [PATCH 15/16] feat(dns): replace post with get in check delegation status --- .stats.yml | 4 +- api.md | 2 + src/gcore/resources/dns/zones/zones.py | 83 +++++++++++++++++++ src/gcore/types/dns/__init__.py | 4 + src/gcore/types/dns/dns_name_server.py | 17 ++++ .../zone_check_delegation_status_response.py | 20 +++++ tests/api_resources/dns/test_zones.py | 77 +++++++++++++++++ 7 files changed, 205 insertions(+), 2 deletions(-) create mode 100644 src/gcore/types/dns/dns_name_server.py create mode 100644 src/gcore/types/dns/zone_check_delegation_status_response.py diff --git a/.stats.yml b/.stats.yml index e7c17a4a..8d64ea87 100644 --- a/.stats.yml +++ b/.stats.yml @@ -1,4 +1,4 @@ -configured_endpoints: 523 +configured_endpoints: 524 openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/gcore%2Fgcore-3721d496395e684887e9ba0386375910a4fe68253893ccfce4e79c2e8a5b84af.yml openapi_spec_hash: f95b9f70ed1b3b8230ef3a092c6acedd -config_hash: b0843ba896a2b11b93b1e2f7088fd0c6 +config_hash: bfac9dcd59fec1e54559dc11fcba758e diff --git a/api.md b/api.md index 1488d6ea..56d6038b 100644 --- a/api.md +++ b/api.md @@ -1921,6 +1921,7 @@ from gcore.types.dns import ( DNSNameServer, ZoneCreateResponse, ZoneListResponse, + ZoneCheckDelegationStatusResponse, ZoneExportResponse, ZoneGetResponse, ZoneGetStatisticsResponse, @@ -1933,6 +1934,7 @@ Methods: - client.dns.zones.create(\*\*params) -> ZoneCreateResponse - client.dns.zones.list(\*\*params) -> ZoneListResponse - client.dns.zones.delete(name) -> object +- client.dns.zones.check_delegation_status(name) -> ZoneCheckDelegationStatusResponse - client.dns.zones.disable(name) -> object - client.dns.zones.enable(name) -> object - client.dns.zones.export(zone_name) -> ZoneExportResponse diff --git a/src/gcore/resources/dns/zones/zones.py b/src/gcore/resources/dns/zones/zones.py index e5ab591d..2bef8d84 100644 --- a/src/gcore/resources/dns/zones/zones.py +++ b/src/gcore/resources/dns/zones/zones.py @@ -48,6 +48,7 @@ from ....types.dns.zone_export_response import ZoneExportResponse from ....types.dns.zone_import_response import ZoneImportResponse from ....types.dns.zone_get_statistics_response import ZoneGetStatisticsResponse +from ....types.dns.zone_check_delegation_status_response import ZoneCheckDelegationStatusResponse __all__ = ["ZonesResource", "AsyncZonesResource"] @@ -289,6 +290,41 @@ def delete( cast_to=object, ) + def check_delegation_status( + self, + name: str, + *, + # 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, + ) -> ZoneCheckDelegationStatusResponse: + """Returns delegation status for specified domain name. + + This endpoint has rate + limit. + + Args: + extra_headers: Send extra headers + + extra_query: Add additional query parameters to the request + + extra_body: Add additional JSON properties to the request + + timeout: Override the client-level default timeout for this request, in seconds + """ + if not name: + raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") + return self._get( + f"/dns/v2/analyze/{name}/delegation-status", + options=make_request_options( + extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout + ), + cast_to=ZoneCheckDelegationStatusResponse, + ) + def disable( self, name: str, @@ -880,6 +916,41 @@ async def delete( cast_to=object, ) + async def check_delegation_status( + self, + name: str, + *, + # 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, + ) -> ZoneCheckDelegationStatusResponse: + """Returns delegation status for specified domain name. + + This endpoint has rate + limit. + + Args: + extra_headers: Send extra headers + + extra_query: Add additional query parameters to the request + + extra_body: Add additional JSON properties to the request + + timeout: Override the client-level default timeout for this request, in seconds + """ + if not name: + raise ValueError(f"Expected a non-empty value for `name` but received {name!r}") + return await self._get( + f"/dns/v2/analyze/{name}/delegation-status", + options=make_request_options( + extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout + ), + cast_to=ZoneCheckDelegationStatusResponse, + ) + async def disable( self, name: str, @@ -1247,6 +1318,9 @@ def __init__(self, zones: ZonesResource) -> None: self.delete = to_raw_response_wrapper( zones.delete, ) + self.check_delegation_status = to_raw_response_wrapper( + zones.check_delegation_status, + ) self.disable = to_raw_response_wrapper( zones.disable, ) @@ -1291,6 +1365,9 @@ def __init__(self, zones: AsyncZonesResource) -> None: self.delete = async_to_raw_response_wrapper( zones.delete, ) + self.check_delegation_status = async_to_raw_response_wrapper( + zones.check_delegation_status, + ) self.disable = async_to_raw_response_wrapper( zones.disable, ) @@ -1335,6 +1412,9 @@ def __init__(self, zones: ZonesResource) -> None: self.delete = to_streamed_response_wrapper( zones.delete, ) + self.check_delegation_status = to_streamed_response_wrapper( + zones.check_delegation_status, + ) self.disable = to_streamed_response_wrapper( zones.disable, ) @@ -1379,6 +1459,9 @@ def __init__(self, zones: AsyncZonesResource) -> None: self.delete = async_to_streamed_response_wrapper( zones.delete, ) + self.check_delegation_status = async_to_streamed_response_wrapper( + zones.check_delegation_status, + ) self.disable = async_to_streamed_response_wrapper( zones.disable, ) diff --git a/src/gcore/types/dns/__init__.py b/src/gcore/types/dns/__init__.py index e41ca78e..f72384a3 100644 --- a/src/gcore/types/dns/__init__.py +++ b/src/gcore/types/dns/__init__.py @@ -3,6 +3,7 @@ from __future__ import annotations from .dns_label_name import DNSLabelName as DNSLabelName +from .dns_name_server import DNSNameServer as DNSNameServer from .zone_list_params import ZoneListParams as ZoneListParams from .dns_lookup_params import DNSLookupParams as DNSLookupParams from .zone_get_response import ZoneGetResponse as ZoneGetResponse @@ -25,3 +26,6 @@ from .location_list_countries_response import LocationListCountriesResponse as LocationListCountriesResponse from .dns_get_account_overview_response import DNSGetAccountOverviewResponse as DNSGetAccountOverviewResponse from .location_list_continents_response import LocationListContinentsResponse as LocationListContinentsResponse +from .zone_check_delegation_status_response import ( + ZoneCheckDelegationStatusResponse as ZoneCheckDelegationStatusResponse, +) diff --git a/src/gcore/types/dns/dns_name_server.py b/src/gcore/types/dns/dns_name_server.py new file mode 100644 index 00000000..619c4943 --- /dev/null +++ b/src/gcore/types/dns/dns_name_server.py @@ -0,0 +1,17 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import List, Optional + +from pydantic import Field as FieldInfo + +from ..._models import BaseModel + +__all__ = ["DNSNameServer"] + + +class DNSNameServer(BaseModel): + ipv4_addresses: Optional[List[str]] = FieldInfo(alias="ipv4Addresses", default=None) + + ipv6_addresses: Optional[List[str]] = FieldInfo(alias="ipv6Addresses", default=None) + + name: Optional[str] = None diff --git a/src/gcore/types/dns/zone_check_delegation_status_response.py b/src/gcore/types/dns/zone_check_delegation_status_response.py new file mode 100644 index 00000000..ae89139a --- /dev/null +++ b/src/gcore/types/dns/zone_check_delegation_status_response.py @@ -0,0 +1,20 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import List, Optional + +from ..._models import BaseModel +from .dns_name_server import DNSNameServer + +__all__ = ["ZoneCheckDelegationStatusResponse"] + + +class ZoneCheckDelegationStatusResponse(BaseModel): + authoritative_name_servers: Optional[List[DNSNameServer]] = None + + gcore_authorized_count: Optional[int] = None + + is_whitelabel_delegation: Optional[bool] = None + + non_gcore_authorized_count: Optional[int] = None + + zone_exists: Optional[bool] = None diff --git a/tests/api_resources/dns/test_zones.py b/tests/api_resources/dns/test_zones.py index 466834c7..cdb8d744 100644 --- a/tests/api_resources/dns/test_zones.py +++ b/tests/api_resources/dns/test_zones.py @@ -17,6 +17,7 @@ ZoneExportResponse, ZoneImportResponse, ZoneGetStatisticsResponse, + ZoneCheckDelegationStatusResponse, ) base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -158,6 +159,44 @@ def test_path_params_delete(self, client: Gcore) -> None: "", ) + @parametrize + def test_method_check_delegation_status(self, client: Gcore) -> None: + zone = client.dns.zones.check_delegation_status( + "name", + ) + assert_matches_type(ZoneCheckDelegationStatusResponse, zone, path=["response"]) + + @parametrize + def test_raw_response_check_delegation_status(self, client: Gcore) -> None: + response = client.dns.zones.with_raw_response.check_delegation_status( + "name", + ) + + assert response.is_closed is True + assert response.http_request.headers.get("X-Stainless-Lang") == "python" + zone = response.parse() + assert_matches_type(ZoneCheckDelegationStatusResponse, zone, path=["response"]) + + @parametrize + def test_streaming_response_check_delegation_status(self, client: Gcore) -> None: + with client.dns.zones.with_streaming_response.check_delegation_status( + "name", + ) as response: + assert not response.is_closed + assert response.http_request.headers.get("X-Stainless-Lang") == "python" + + zone = response.parse() + assert_matches_type(ZoneCheckDelegationStatusResponse, zone, path=["response"]) + + assert cast(Any, response.is_closed) is True + + @parametrize + def test_path_params_check_delegation_status(self, client: Gcore) -> None: + with pytest.raises(ValueError, match=r"Expected a non-empty value for `name` but received ''"): + client.dns.zones.with_raw_response.check_delegation_status( + "", + ) + @parametrize def test_method_disable(self, client: Gcore) -> None: zone = client.dns.zones.disable( @@ -603,6 +642,44 @@ async def test_path_params_delete(self, async_client: AsyncGcore) -> None: "", ) + @parametrize + async def test_method_check_delegation_status(self, async_client: AsyncGcore) -> None: + zone = await async_client.dns.zones.check_delegation_status( + "name", + ) + assert_matches_type(ZoneCheckDelegationStatusResponse, zone, path=["response"]) + + @parametrize + async def test_raw_response_check_delegation_status(self, async_client: AsyncGcore) -> None: + response = await async_client.dns.zones.with_raw_response.check_delegation_status( + "name", + ) + + assert response.is_closed is True + assert response.http_request.headers.get("X-Stainless-Lang") == "python" + zone = await response.parse() + assert_matches_type(ZoneCheckDelegationStatusResponse, zone, path=["response"]) + + @parametrize + async def test_streaming_response_check_delegation_status(self, async_client: AsyncGcore) -> None: + async with async_client.dns.zones.with_streaming_response.check_delegation_status( + "name", + ) as response: + assert not response.is_closed + assert response.http_request.headers.get("X-Stainless-Lang") == "python" + + zone = await response.parse() + assert_matches_type(ZoneCheckDelegationStatusResponse, zone, path=["response"]) + + assert cast(Any, response.is_closed) is True + + @parametrize + async def test_path_params_check_delegation_status(self, async_client: AsyncGcore) -> None: + with pytest.raises(ValueError, match=r"Expected a non-empty value for `name` but received ''"): + await async_client.dns.zones.with_raw_response.check_delegation_status( + "", + ) + @parametrize async def test_method_disable(self, async_client: AsyncGcore) -> None: zone = await async_client.dns.zones.disable( From 6c7a5ac8cb4fea4a8a9818fba1eee07d6415174d Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Tue, 16 Sep 2025 15:09:34 +0000 Subject: [PATCH 16/16] release: 0.13.0 --- .release-please-manifest.json | 2 +- CHANGELOG.md | 24 ++++++++++++++++++++++++ pyproject.toml | 2 +- src/gcore/_version.py | 2 +- 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index a7130553..d52d2b97 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "0.12.0" + ".": "0.13.0" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fcdfcb5..e7b72504 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,29 @@ # Changelog +## 0.13.0 (2025-09-16) + +Full Changelog: [v0.12.0...v0.13.0](https://github.com/G-Core/gcore-python/compare/v0.12.0...v0.13.0) + +### ⚠ BREAKING CHANGES + +* **waap:** model references + +### Features + +* **api:** aggregated API specs update ([2954990](https://github.com/G-Core/gcore-python/commit/295499000a8e2b1ef24ae497cb34fafbf38f2149)) +* **api:** aggregated API specs update ([09db4dd](https://github.com/G-Core/gcore-python/commit/09db4dde07cbec7bb8e94348c6ef78578c3022d3)) +* **api:** aggregated API specs update ([a2de60c](https://github.com/G-Core/gcore-python/commit/a2de60c773c01aeb6223001a0d8bff5463fa82ef)) +* **api:** aggregated API specs update ([ccf4739](https://github.com/G-Core/gcore-python/commit/ccf4739750f27e01ece2ff147458dd7fe9305437)) +* **api:** aggregated API specs update ([484ee11](https://github.com/G-Core/gcore-python/commit/484ee1144558b56f40d5bc41b9613370dc74c42e)) +* **cloud:** support floating IPs update ([28a8882](https://github.com/G-Core/gcore-python/commit/28a888260878577e697004da02077ef96a8616ad)) +* **dns:** replace post with get in check delegation status ([ddd12bd](https://github.com/G-Core/gcore-python/commit/ddd12bd4782b8883d82b97a45d043ad3970ee31a)) + + +### Bug Fixes + +* **cloud:** floating ips examples ([bf8a5dd](https://github.com/G-Core/gcore-python/commit/bf8a5ddff3e777441db47163dc03b73052d99ecd)) +* **waap:** model references ([4f69e7e](https://github.com/G-Core/gcore-python/commit/4f69e7e5aa778cf82357d7d097e874100bfa9e0d)) + ## 0.12.0 (2025-09-11) Full Changelog: [v0.11.0...v0.12.0](https://github.com/G-Core/gcore-python/compare/v0.11.0...v0.12.0) diff --git a/pyproject.toml b/pyproject.toml index 29e96268..4e7dd1c1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "gcore" -version = "0.12.0" +version = "0.13.0" description = "The official Python library for the gcore API" dynamic = ["readme"] license = "Apache-2.0" diff --git a/src/gcore/_version.py b/src/gcore/_version.py index 7f12d5d7..30d62a13 100644 --- a/src/gcore/_version.py +++ b/src/gcore/_version.py @@ -1,4 +1,4 @@ # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. __title__ = "gcore" -__version__ = "0.12.0" # x-release-please-version +__version__ = "0.13.0" # x-release-please-version