gcore 0.2.0__py3-none-any.whl → 0.4.0__py3-none-any.whl

gcore/__init__.py

@@ -26,7 +26,7 @@ from ._exceptions import (
     UnprocessableEntityError,
     APIResponseValidationError,
 )
-from ._base_client import DefaultHttpxClient, DefaultAsyncHttpxClient
+from ._base_client import DefaultHttpxClient, DefaultAioHttpClient, DefaultAsyncHttpxClient
 from ._utils._logs import setup_logging as _setup_logging
 
 __all__ = [
@@ -68,6 +68,7 @@ __all__ = [
     "DEFAULT_CONNECTION_LIMITS",
     "DefaultHttpxClient",
     "DefaultAsyncHttpxClient",
+    "DefaultAioHttpClient",
 ]
 
 if not _t.TYPE_CHECKING:

gcore/_base_client.py

@@ -960,6 +960,9 @@ class SyncAPIClient(BaseClient[httpx.Client, Stream[Any]]):
             if self.custom_auth is not None:
                 kwargs["auth"] = self.custom_auth
 
+            if options.follow_redirects is not None:
+                kwargs["follow_redirects"] = options.follow_redirects
+
             log.debug("Sending HTTP Request: %s %s", request.method, request.url)
 
             response = None
@@ -1068,7 +1071,14 @@ class SyncAPIClient(BaseClient[httpx.Client, Stream[Any]]):
     ) -> ResponseT:
         origin = get_origin(cast_to) or cast_to
 
-        if inspect.isclass(origin) and issubclass(origin, BaseAPIResponse):
+        if (
+            inspect.isclass(origin)
+            and issubclass(origin, BaseAPIResponse)
+            # we only want to actually return the custom BaseAPIResponse class if we're
+            # returning the raw response, or if we're not streaming SSE, as if we're streaming
+            # SSE then `cast_to` doesn't actively reflect the type we need to parse into
+            and (not stream or bool(response.request.headers.get(RAW_RESPONSE_HEADER)))
+        ):
             if not issubclass(origin, APIResponse):
                 raise TypeError(f"API Response types must subclass {APIResponse}; Received {origin}")
 
@@ -1279,6 +1289,24 @@ class _DefaultAsyncHttpxClient(httpx.AsyncClient):
         super().__init__(**kwargs)
 
 
+try:
+    import httpx_aiohttp
+except ImportError:
+
+    class _DefaultAioHttpClient(httpx.AsyncClient):
+        def __init__(self, **_kwargs: Any) -> None:
+            raise RuntimeError("To use the aiohttp client you must have installed the package with the `aiohttp` extra")
+else:
+
+    class _DefaultAioHttpClient(httpx_aiohttp.HttpxAiohttpClient):  # type: ignore
+        def __init__(self, **kwargs: Any) -> None:
+            kwargs.setdefault("timeout", DEFAULT_TIMEOUT)
+            kwargs.setdefault("limits", DEFAULT_CONNECTION_LIMITS)
+            kwargs.setdefault("follow_redirects", True)
+
+            super().__init__(**kwargs)
+
+
 if TYPE_CHECKING:
     DefaultAsyncHttpxClient = httpx.AsyncClient
     """An alias to `httpx.AsyncClient` that provides the same defaults that this SDK
@@ -1287,8 +1315,12 @@ if TYPE_CHECKING:
     This is useful because overriding the `http_client` with your own instance of
     `httpx.AsyncClient` will result in httpx's defaults being used, not ours.
     """
+
+    DefaultAioHttpClient = httpx.AsyncClient
+    """An alias to `httpx.AsyncClient` that changes the default HTTP transport to `aiohttp`."""
 else:
     DefaultAsyncHttpxClient = _DefaultAsyncHttpxClient
+    DefaultAioHttpClient = _DefaultAioHttpClient
 
 
 class AsyncHttpxClientWrapper(DefaultAsyncHttpxClient):
@@ -1460,6 +1492,9 @@ class AsyncAPIClient(BaseClient[httpx.AsyncClient, AsyncStream[Any]]):
             if self.custom_auth is not None:
                 kwargs["auth"] = self.custom_auth
 
+            if options.follow_redirects is not None:
+                kwargs["follow_redirects"] = options.follow_redirects
+
             log.debug("Sending HTTP Request: %s %s", request.method, request.url)
 
             response = None
@@ -1568,7 +1603,14 @@ class AsyncAPIClient(BaseClient[httpx.AsyncClient, AsyncStream[Any]]):
     ) -> ResponseT:
         origin = get_origin(cast_to) or cast_to
 
-        if inspect.isclass(origin) and issubclass(origin, BaseAPIResponse):
+        if (
+            inspect.isclass(origin)
+            and issubclass(origin, BaseAPIResponse)
+            # we only want to actually return the custom BaseAPIResponse class if we're
+            # returning the raw response, or if we're not streaming SSE, as if we're streaming
+            # SSE then `cast_to` doesn't actively reflect the type we need to parse into
+            and (not stream or bool(response.request.headers.get(RAW_RESPONSE_HEADER)))
+        ):
             if not issubclass(origin, AsyncAPIResponse):
                 raise TypeError(f"API Response types must subclass {AsyncAPIResponse}; Received {origin}")
 

gcore/_client.py

@@ -28,6 +28,7 @@ from ._base_client import (
     SyncAPIClient,
     AsyncAPIClient,
 )
+from .resources.iam import iam
 from .resources.waap import waap
 from .resources.cloud import cloud
 
@@ -37,6 +38,7 @@ __all__ = ["Timeout", "Transport", "ProxiesTypes", "RequestOptions", "Gcore", "A
 class Gcore(SyncAPIClient):
     cloud: cloud.CloudResource
     waap: waap.WaapResource
+    iam: iam.IamResource
     with_raw_response: GcoreWithRawResponse
     with_streaming_response: GcoreWithStreamedResponse
 
@@ -117,6 +119,7 @@ class Gcore(SyncAPIClient):
 
         self.cloud = cloud.CloudResource(self)
         self.waap = waap.WaapResource(self)
+        self.iam = iam.IamResource(self)
         self.with_raw_response = GcoreWithRawResponse(self)
         self.with_streaming_response = GcoreWithStreamedResponse(self)
 
@@ -252,6 +255,7 @@ class Gcore(SyncAPIClient):
 class AsyncGcore(AsyncAPIClient):
     cloud: cloud.AsyncCloudResource
     waap: waap.AsyncWaapResource
+    iam: iam.AsyncIamResource
     with_raw_response: AsyncGcoreWithRawResponse
     with_streaming_response: AsyncGcoreWithStreamedResponse
 
@@ -332,6 +336,7 @@ class AsyncGcore(AsyncAPIClient):
 
         self.cloud = cloud.AsyncCloudResource(self)
         self.waap = waap.AsyncWaapResource(self)
+        self.iam = iam.AsyncIamResource(self)
         self.with_raw_response = AsyncGcoreWithRawResponse(self)
         self.with_streaming_response = AsyncGcoreWithStreamedResponse(self)
 
@@ -468,24 +473,28 @@ class GcoreWithRawResponse:
     def __init__(self, client: Gcore) -> None:
         self.cloud = cloud.CloudResourceWithRawResponse(client.cloud)
         self.waap = waap.WaapResourceWithRawResponse(client.waap)
+        self.iam = iam.IamResourceWithRawResponse(client.iam)
 
 
 class AsyncGcoreWithRawResponse:
     def __init__(self, client: AsyncGcore) -> None:
         self.cloud = cloud.AsyncCloudResourceWithRawResponse(client.cloud)
         self.waap = waap.AsyncWaapResourceWithRawResponse(client.waap)
+        self.iam = iam.AsyncIamResourceWithRawResponse(client.iam)
 
 
 class GcoreWithStreamedResponse:
     def __init__(self, client: Gcore) -> None:
         self.cloud = cloud.CloudResourceWithStreamingResponse(client.cloud)
         self.waap = waap.WaapResourceWithStreamingResponse(client.waap)
+        self.iam = iam.IamResourceWithStreamingResponse(client.iam)
 
 
 class AsyncGcoreWithStreamedResponse:
     def __init__(self, client: AsyncGcore) -> None:
         self.cloud = cloud.AsyncCloudResourceWithStreamingResponse(client.cloud)
         self.waap = waap.AsyncWaapResourceWithStreamingResponse(client.waap)
+        self.iam = iam.AsyncIamResourceWithStreamingResponse(client.iam)
 
 
 Client = Gcore

gcore/_models.py

@@ -737,6 +737,7 @@ class FinalRequestOptionsInput(TypedDict, total=False):
     idempotency_key: str
     json_data: Body
     extra_json: AnyMapping
+    follow_redirects: bool
 
 
 @final
@@ -750,6 +751,7 @@ class FinalRequestOptions(pydantic.BaseModel):
     files: Union[HttpxRequestFiles, None] = None
     idempotency_key: Union[str, None] = None
     post_parser: Union[Callable[[Any], Any], NotGiven] = NotGiven()
+    follow_redirects: Union[bool, None] = None
 
     # It should be noted that we cannot use `json` here as that would override
     # a BaseModel method in an incompatible fashion.

gcore/_types.py

@@ -100,6 +100,7 @@ class RequestOptions(TypedDict, total=False):
     params: Query
     extra_json: AnyMapping
     idempotency_key: str
+    follow_redirects: bool
 
 
 # Sentinel class used until PEP 0661 is accepted
@@ -215,3 +216,4 @@ class _GenericAlias(Protocol):
 
 class HttpxSendArgs(TypedDict, total=False):
     auth: httpx.Auth
+    follow_redirects: bool

gcore/_version.py

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

gcore/pagination.py

@@ -5,7 +5,7 @@ from typing_extensions import override
 
 from ._base_client import BasePage, PageInfo, BaseSyncPage, BaseAsyncPage
 
-__all__ = ["SyncOffsetPage", "AsyncOffsetPage"]
+__all__ = ["SyncOffsetPage", "AsyncOffsetPage", "SyncOffsetPageIam", "AsyncOffsetPageIam"]
 
 _T = TypeVar("_T")
 
@@ -68,3 +68,63 @@ class AsyncOffsetPage(BaseAsyncPage[_T], BasePage[_T], Generic[_T]):
             return PageInfo(params={"offset": current_count})
 
         return None
+
+
+class SyncOffsetPageIam(BaseSyncPage[_T], BasePage[_T], Generic[_T]):
+    result: List[_T]
+    count: Optional[int] = None
+
+    @override
+    def _get_page_items(self) -> List[_T]:
+        result = self.result
+        if not result:
+            return []
+        return result
+
+    @override
+    def next_page_info(self) -> Optional[PageInfo]:
+        offset = self._options.params.get("offset") or 0
+        if not isinstance(offset, int):
+            raise ValueError(f'Expected "offset" param to be an integer but got {offset}')
+
+        length = len(self._get_page_items())
+        current_count = offset + length
+
+        count = self.count
+        if count is None:
+            return None
+
+        if current_count < count:
+            return PageInfo(params={"offset": current_count})
+
+        return None
+
+
+class AsyncOffsetPageIam(BaseAsyncPage[_T], BasePage[_T], Generic[_T]):
+    result: List[_T]
+    count: Optional[int] = None
+
+    @override
+    def _get_page_items(self) -> List[_T]:
+        result = self.result
+        if not result:
+            return []
+        return result
+
+    @override
+    def next_page_info(self) -> Optional[PageInfo]:
+        offset = self._options.params.get("offset") or 0
+        if not isinstance(offset, int):
+            raise ValueError(f'Expected "offset" param to be an integer but got {offset}')
+
+        length = len(self._get_page_items())
+        current_count = offset + length
+
+        count = self.count
+        if count is None:
+            return None
+
+        if current_count < count:
+            return PageInfo(params={"offset": current_count})
+
+        return None

gcore/resources/__init__.py

@@ -1,5 +1,13 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from .iam import (
+    IamResource,
+    AsyncIamResource,
+    IamResourceWithRawResponse,
+    AsyncIamResourceWithRawResponse,
+    IamResourceWithStreamingResponse,
+    AsyncIamResourceWithStreamingResponse,
+)
 from .waap import (
     WaapResource,
     AsyncWaapResource,
@@ -30,4 +38,10 @@ __all__ = [
     "AsyncWaapResourceWithRawResponse",
     "WaapResourceWithStreamingResponse",
     "AsyncWaapResourceWithStreamingResponse",
+    "IamResource",
+    "AsyncIamResource",
+    "IamResourceWithRawResponse",
+    "AsyncIamResourceWithRawResponse",
+    "IamResourceWithStreamingResponse",
+    "AsyncIamResourceWithStreamingResponse",
 ]

gcore/resources/cloud/baremetal/flavors.py

@@ -15,7 +15,7 @@ from ...._response import (
     async_to_streamed_response_wrapper,
 )
 from ...._base_client import make_request_options
-from ....types.cloud.baremetal import flavor_list_params, flavor_list_suitable_params
+from ....types.cloud.baremetal import flavor_list_params
 from ....types.cloud.baremetal_flavor_list import BaremetalFlavorList
 
 __all__ = ["FlavorsResource", "AsyncFlavorsResource"]
@@ -59,11 +59,12 @@ class FlavorsResource(SyncAPIResource):
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
     ) -> BaremetalFlavorList:
-        """Retrieve a list of flavors.
+        """List all available bare metal flavors in the specified project and region.
 
-        When the include_prices query parameter is
-        specified, the list shows prices. A client in trial mode gets all price values
-        as 0. If you get Pricing Error contact the support
+        When
+        `include_prices` is specified, the list includes pricing information. A client
+        in trial mode gets all price values as 0. If you get Pricing Error contact the
+        support.
 
         Args:
           disabled: Flag for filtering disabled flavors in the region. Defaults to true
@@ -113,64 +114,6 @@ class FlavorsResource(SyncAPIResource):
             cast_to=BaremetalFlavorList,
         )
 
-    def list_suitable(
-        self,
-        *,
-        project_id: int | None = None,
-        region_id: int | None = None,
-        include_prices: bool | NotGiven = NOT_GIVEN,
-        apptemplate_id: str | NotGiven = NOT_GIVEN,
-        image_id: str | 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,
-    ) -> BaremetalFlavorList:
-        """
-        List suitalbe flavors for bare metal server creation
-
-        Args:
-          include_prices: Set to true if flavor listing should include flavor prices
-
-          apptemplate_id: Apptemplate ID
-
-          image_id: Image ID
-
-          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()
-        return self._post(
-            f"/cloud/v1/bminstances/{project_id}/{region_id}/available_flavors",
-            body=maybe_transform(
-                {
-                    "apptemplate_id": apptemplate_id,
-                    "image_id": image_id,
-                },
-                flavor_list_suitable_params.FlavorListSuitableParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=maybe_transform(
-                    {"include_prices": include_prices}, flavor_list_suitable_params.FlavorListSuitableParams
-                ),
-            ),
-            cast_to=BaremetalFlavorList,
-        )
-
 
 class AsyncFlavorsResource(AsyncAPIResource):
     @cached_property
@@ -210,11 +153,12 @@ class AsyncFlavorsResource(AsyncAPIResource):
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
     ) -> BaremetalFlavorList:
-        """Retrieve a list of flavors.
+        """List all available bare metal flavors in the specified project and region.
 
-        When the include_prices query parameter is
-        specified, the list shows prices. A client in trial mode gets all price values
-        as 0. If you get Pricing Error contact the support
+        When
+        `include_prices` is specified, the list includes pricing information. A client
+        in trial mode gets all price values as 0. If you get Pricing Error contact the
+        support.
 
         Args:
           disabled: Flag for filtering disabled flavors in the region. Defaults to true
@@ -264,64 +208,6 @@ class AsyncFlavorsResource(AsyncAPIResource):
             cast_to=BaremetalFlavorList,
         )
 
-    async def list_suitable(
-        self,
-        *,
-        project_id: int | None = None,
-        region_id: int | None = None,
-        include_prices: bool | NotGiven = NOT_GIVEN,
-        apptemplate_id: str | NotGiven = NOT_GIVEN,
-        image_id: str | 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,
-    ) -> BaremetalFlavorList:
-        """
-        List suitalbe flavors for bare metal server creation
-
-        Args:
-          include_prices: Set to true if flavor listing should include flavor prices
-
-          apptemplate_id: Apptemplate ID
-
-          image_id: Image ID
-
-          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()
-        return await self._post(
-            f"/cloud/v1/bminstances/{project_id}/{region_id}/available_flavors",
-            body=await async_maybe_transform(
-                {
-                    "apptemplate_id": apptemplate_id,
-                    "image_id": image_id,
-                },
-                flavor_list_suitable_params.FlavorListSuitableParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=await async_maybe_transform(
-                    {"include_prices": include_prices}, flavor_list_suitable_params.FlavorListSuitableParams
-                ),
-            ),
-            cast_to=BaremetalFlavorList,
-        )
-
 
 class FlavorsResourceWithRawResponse:
     def __init__(self, flavors: FlavorsResource) -> None:
@@ -330,9 +216,6 @@ class FlavorsResourceWithRawResponse:
         self.list = to_raw_response_wrapper(
             flavors.list,
         )
-        self.list_suitable = to_raw_response_wrapper(
-            flavors.list_suitable,
-        )
 
 
 class AsyncFlavorsResourceWithRawResponse:
@@ -342,9 +225,6 @@ class AsyncFlavorsResourceWithRawResponse:
         self.list = async_to_raw_response_wrapper(
             flavors.list,
         )
-        self.list_suitable = async_to_raw_response_wrapper(
-            flavors.list_suitable,
-        )
 
 
 class FlavorsResourceWithStreamingResponse:
@@ -354,9 +234,6 @@ class FlavorsResourceWithStreamingResponse:
         self.list = to_streamed_response_wrapper(
             flavors.list,
         )
-        self.list_suitable = to_streamed_response_wrapper(
-            flavors.list_suitable,
-        )
 
 
 class AsyncFlavorsResourceWithStreamingResponse:
@@ -366,6 +243,3 @@ class AsyncFlavorsResourceWithStreamingResponse:
         self.list = async_to_streamed_response_wrapper(
             flavors.list,
         )
-        self.list_suitable = async_to_streamed_response_wrapper(
-            flavors.list_suitable,
-        )

gcore/resources/cloud/baremetal/images.py

@@ -61,10 +61,11 @@ class ImagesResource(SyncAPIResource):
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
     ) -> ImageList:
-        """Retrieve the available images list for bare metal servers.
+        """Retrieve a list of available images for bare metal servers.
 
-        Returned entities may
-        or may not be owned by the project
+        The list can be
+        filtered by visibility, tags, and other parameters. Returned entities may or may
+        not be owned by the project.
 
         Args:
           include_prices: Show price
@@ -73,9 +74,7 @@ class ImagesResource(SyncAPIResource):
 
           tag_key: Filter by tag keys.
 
-          tag_key_value: Filter by tag key-value pairs. Must be a valid JSON string. 'curl -G
-              --data-urlencode 'tag_key_value={"key": "value"}' --url
-              'http://localhost:1111/v1/images/1/1'"
+          tag_key_value: Filter by tag key-value pairs. Must be a valid JSON string.
 
           visibility: Image visibility. Globally visible images are public
 
@@ -150,10 +149,11 @@ class AsyncImagesResource(AsyncAPIResource):
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
     ) -> ImageList:
-        """Retrieve the available images list for bare metal servers.
+        """Retrieve a list of available images for bare metal servers.
 
-        Returned entities may
-        or may not be owned by the project
+        The list can be
+        filtered by visibility, tags, and other parameters. Returned entities may or may
+        not be owned by the project.
 
         Args:
           include_prices: Show price
@@ -162,9 +162,7 @@ class AsyncImagesResource(AsyncAPIResource):
 
           tag_key: Filter by tag keys.
 
-          tag_key_value: Filter by tag key-value pairs. Must be a valid JSON string. 'curl -G
-              --data-urlencode 'tag_key_value={"key": "value"}' --url
-              'http://localhost:1111/v1/images/1/1'"
+          tag_key_value: Filter by tag key-value pairs. Must be a valid JSON string.
 
           visibility: Image visibility. Globally visible images are public