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

gcore/resources/cloud/baremetal/servers.py

@@ -161,9 +161,7 @@ class ServersResource(SyncAPIResource):
         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,
@@ -301,9 +299,7 @@ class ServersResource(SyncAPIResource):
         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,
@@ -386,9 +382,7 @@ class ServersResource(SyncAPIResource):
         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,
@@ -421,6 +415,7 @@ class ServersResource(SyncAPIResource):
         user_data: str | Omit = omit,
         username: str | Omit = omit,
         polling_interval_seconds: int | Omit = omit,
+        polling_timeout_seconds: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -456,6 +451,7 @@ class ServersResource(SyncAPIResource):
             response.tasks[0],
             extra_headers=extra_headers,
             polling_interval_seconds=polling_interval_seconds,
+            polling_timeout_seconds=polling_timeout_seconds,
         )
         if not task.created_resources or not task.created_resources.instances:
             raise ValueError("No server was created")
@@ -481,6 +477,7 @@ class ServersResource(SyncAPIResource):
         image_id: str | Omit = omit,
         user_data: str | Omit = omit,
         polling_interval_seconds: int | Omit = omit,
+        polling_timeout_seconds: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -506,6 +503,7 @@ class ServersResource(SyncAPIResource):
             response.tasks[0],
             extra_headers=extra_headers,
             polling_interval_seconds=polling_interval_seconds,
+            polling_timeout_seconds=polling_timeout_seconds,
         )
         servers = self.list(
             project_id=project_id,
@@ -654,9 +652,7 @@ class AsyncServersResource(AsyncAPIResource):
         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,
@@ -794,9 +790,7 @@ class AsyncServersResource(AsyncAPIResource):
         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,
@@ -879,9 +873,7 @@ class AsyncServersResource(AsyncAPIResource):
         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,
@@ -914,6 +906,7 @@ class AsyncServersResource(AsyncAPIResource):
         user_data: str | Omit = omit,
         username: str | Omit = omit,
         polling_interval_seconds: int | Omit = omit,
+        polling_timeout_seconds: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -949,6 +942,7 @@ class AsyncServersResource(AsyncAPIResource):
             response.tasks[0],
             extra_headers=extra_headers,
             polling_interval_seconds=polling_interval_seconds,
+            polling_timeout_seconds=polling_timeout_seconds,
         )
         if not task.created_resources or not task.created_resources.instances:
             raise ValueError("No server was created")
@@ -974,6 +968,7 @@ class AsyncServersResource(AsyncAPIResource):
         image_id: str | Omit = omit,
         user_data: str | Omit = omit,
         polling_interval_seconds: int | Omit = omit,
+        polling_timeout_seconds: int | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -999,6 +994,7 @@ class AsyncServersResource(AsyncAPIResource):
             response.tasks[0],
             extra_headers=extra_headers,
             polling_interval_seconds=polling_interval_seconds,
+            polling_timeout_seconds=polling_timeout_seconds,
         )
         servers = await self.list(
             project_id=project_id,

gcore/resources/cloud/billing_reservations.py

@@ -2,14 +2,12 @@
 
 from __future__ import annotations
 
-from typing import List, Union
-from datetime import date, datetime
 from typing_extensions import Literal
 
 import httpx
 
 from ..._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
-from ..._utils import maybe_transform
+from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -18,10 +16,9 @@ from ..._response import (
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ...pagination import SyncOffsetPage, AsyncOffsetPage
 from ...types.cloud import billing_reservation_list_params
-from ..._base_client import AsyncPaginator, make_request_options
-from ...types.cloud.billing_reservation import BillingReservation
+from ..._base_client import make_request_options
+from ...types.cloud.billing_reservations import BillingReservations
 
 __all__ = ["BillingReservationsResource", "AsyncBillingReservationsResource"]
 
@@ -49,67 +46,29 @@ class BillingReservationsResource(SyncAPIResource):
     def list(
         self,
         *,
-        activated_from: Union[str, date] | Omit = omit,
-        activated_to: Union[str, date] | Omit = omit,
-        created_from: Union[str, datetime] | Omit = omit,
-        created_to: Union[str, datetime] | Omit = omit,
-        deactivated_from: Union[str, date] | Omit = omit,
-        deactivated_to: Union[str, date] | Omit = omit,
-        limit: int | Omit = omit,
         metric_name: str | Omit = omit,
-        offset: int | Omit = omit,
-        order_by: Literal[
-            "active_from.asc",
-            "active_from.desc",
-            "active_to.asc",
-            "active_to.desc",
-            "created_at.asc",
-            "created_at.desc",
-        ]
-        | Omit = omit,
+        order_by: Literal["active_from.asc", "active_from.desc", "active_to.asc", "active_to.desc"] | Omit = omit,
         region_id: int | Omit = omit,
-        status: List[
-            Literal[
-                "ACTIVATED", "APPROVED", "COPIED", "CREATED", "EXPIRED", "REJECTED", "RESERVED", "WAITING_FOR_PAYMENT"
-            ]
-        ]
-        | Omit = omit,
+        show_inactive: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = not_given,
-    ) -> SyncOffsetPage[BillingReservation]:
+    ) -> BillingReservations:
         """
-        List reservations
+        Get a list of billing reservations along with detailed information on resource
+        configurations and associated pricing.
 
         Args:
-          activated_from: Lower bound, starting from what date the reservation was/will be activated
-
-          activated_to: High bound, before what date the reservation was/will be activated
-
-          created_from: Lower bound the filter, showing result(s) equal to or greater than date the
-              reservation was created
-
-          created_to: High bound the filter, showing result(s) equal to or less date the reservation
-              was created
-
-          deactivated_from: Lower bound, starting from what date the reservation was/will be deactivated
-
-          deactivated_to: High bound, before what date the reservation was/will be deactivated
-
-          limit: Limit of reservation list page
-
           metric_name: Name from billing features for specific resource
 
-          offset: Offset in reservation list
-
           order_by: Order by field and direction.
 
           region_id: Region for reservation
 
-          status: Field for fixed a status by reservation workflow
+          show_inactive: Include inactive commits in the response
 
           extra_headers: Send extra headers
 
@@ -119,11 +78,8 @@ class BillingReservationsResource(SyncAPIResource):
 
           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",
-            page=SyncOffsetPage[BillingReservation],
+        return self._get(
+            "/cloud/v2/reservations",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -131,58 +87,15 @@ class BillingReservationsResource(SyncAPIResource):
                 timeout=timeout,
                 query=maybe_transform(
                     {
-                        "activated_from": activated_from,
-                        "activated_to": activated_to,
-                        "created_from": created_from,
-                        "created_to": created_to,
-                        "deactivated_from": deactivated_from,
-                        "deactivated_to": deactivated_to,
-                        "limit": limit,
                         "metric_name": metric_name,
-                        "offset": offset,
                         "order_by": order_by,
                         "region_id": region_id,
-                        "status": status,
+                        "show_inactive": show_inactive,
                     },
                     billing_reservation_list_params.BillingReservationListParams,
                 ),
             ),
-            model=BillingReservation,
-        )
-
-    def get(
-        self,
-        reservation_id: int,
-        *,
-        # 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,
-    ) -> BillingReservation:
-        """
-        Get reservation
-
-        Args:
-          reservation_id: ID of the reservation
-
-          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
-        """
-        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}",
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            cast_to=BillingReservation,
+            cast_to=BillingReservations,
         )
 
 
@@ -206,70 +119,32 @@ class AsyncBillingReservationsResource(AsyncAPIResource):
         """
         return AsyncBillingReservationsResourceWithStreamingResponse(self)
 
-    def list(
+    async def list(
         self,
         *,
-        activated_from: Union[str, date] | Omit = omit,
-        activated_to: Union[str, date] | Omit = omit,
-        created_from: Union[str, datetime] | Omit = omit,
-        created_to: Union[str, datetime] | Omit = omit,
-        deactivated_from: Union[str, date] | Omit = omit,
-        deactivated_to: Union[str, date] | Omit = omit,
-        limit: int | Omit = omit,
         metric_name: str | Omit = omit,
-        offset: int | Omit = omit,
-        order_by: Literal[
-            "active_from.asc",
-            "active_from.desc",
-            "active_to.asc",
-            "active_to.desc",
-            "created_at.asc",
-            "created_at.desc",
-        ]
-        | Omit = omit,
+        order_by: Literal["active_from.asc", "active_from.desc", "active_to.asc", "active_to.desc"] | Omit = omit,
         region_id: int | Omit = omit,
-        status: List[
-            Literal[
-                "ACTIVATED", "APPROVED", "COPIED", "CREATED", "EXPIRED", "REJECTED", "RESERVED", "WAITING_FOR_PAYMENT"
-            ]
-        ]
-        | Omit = omit,
+        show_inactive: bool | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = not_given,
-    ) -> AsyncPaginator[BillingReservation, AsyncOffsetPage[BillingReservation]]:
+    ) -> BillingReservations:
         """
-        List reservations
+        Get a list of billing reservations along with detailed information on resource
+        configurations and associated pricing.
 
         Args:
-          activated_from: Lower bound, starting from what date the reservation was/will be activated
-
-          activated_to: High bound, before what date the reservation was/will be activated
-
-          created_from: Lower bound the filter, showing result(s) equal to or greater than date the
-              reservation was created
-
-          created_to: High bound the filter, showing result(s) equal to or less date the reservation
-              was created
-
-          deactivated_from: Lower bound, starting from what date the reservation was/will be deactivated
-
-          deactivated_to: High bound, before what date the reservation was/will be deactivated
-
-          limit: Limit of reservation list page
-
           metric_name: Name from billing features for specific resource
 
-          offset: Offset in reservation list
-
           order_by: Order by field and direction.
 
           region_id: Region for reservation
 
-          status: Field for fixed a status by reservation workflow
+          show_inactive: Include inactive commits in the response
 
           extra_headers: Send extra headers
 
@@ -279,70 +154,24 @@ class AsyncBillingReservationsResource(AsyncAPIResource):
 
           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",
-            page=AsyncOffsetPage[BillingReservation],
+        return await self._get(
+            "/cloud/v2/reservations",
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                query=maybe_transform(
+                query=await async_maybe_transform(
                     {
-                        "activated_from": activated_from,
-                        "activated_to": activated_to,
-                        "created_from": created_from,
-                        "created_to": created_to,
-                        "deactivated_from": deactivated_from,
-                        "deactivated_to": deactivated_to,
-                        "limit": limit,
                         "metric_name": metric_name,
-                        "offset": offset,
                         "order_by": order_by,
                         "region_id": region_id,
-                        "status": status,
+                        "show_inactive": show_inactive,
                     },
                     billing_reservation_list_params.BillingReservationListParams,
                 ),
             ),
-            model=BillingReservation,
-        )
-
-    async def get(
-        self,
-        reservation_id: int,
-        *,
-        # 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,
-    ) -> BillingReservation:
-        """
-        Get reservation
-
-        Args:
-          reservation_id: ID of the reservation
-
-          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
-        """
-        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}",
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            cast_to=BillingReservation,
+            cast_to=BillingReservations,
         )
 
 
@@ -353,9 +182,6 @@ class BillingReservationsResourceWithRawResponse:
         self.list = to_raw_response_wrapper(
             billing_reservations.list,
         )
-        self.get = to_raw_response_wrapper(
-            billing_reservations.get,
-        )
 
 
 class AsyncBillingReservationsResourceWithRawResponse:
@@ -365,9 +191,6 @@ class AsyncBillingReservationsResourceWithRawResponse:
         self.list = async_to_raw_response_wrapper(
             billing_reservations.list,
         )
-        self.get = async_to_raw_response_wrapper(
-            billing_reservations.get,
-        )
 
 
 class BillingReservationsResourceWithStreamingResponse:
@@ -377,9 +200,6 @@ class BillingReservationsResourceWithStreamingResponse:
         self.list = to_streamed_response_wrapper(
             billing_reservations.list,
         )
-        self.get = to_streamed_response_wrapper(
-            billing_reservations.get,
-        )
 
 
 class AsyncBillingReservationsResourceWithStreamingResponse:
@@ -389,6 +209,3 @@ class AsyncBillingReservationsResourceWithStreamingResponse:
         self.list = async_to_streamed_response_wrapper(
             billing_reservations.list,
         )
-        self.get = async_to_streamed_response_wrapper(
-            billing_reservations.get,
-        )

gcore/resources/cloud/cloud.py

@@ -283,6 +283,9 @@ class CloudResource(SyncAPIResource):
 
     @cached_property
     def placement_groups(self) -> PlacementGroupsResource:
+        """
+        Placement Groups allow you to specific a policy that determines whether Virtual Machines will be hosted on the same physical server or on different ones.
+        """
         return PlacementGroupsResource(self._client)
 
     @cached_property
@@ -412,6 +415,9 @@ class AsyncCloudResource(AsyncAPIResource):
 
     @cached_property
     def placement_groups(self) -> AsyncPlacementGroupsResource:
+        """
+        Placement Groups allow you to specific a policy that determines whether Virtual Machines will be hosted on the same physical server or on different ones.
+        """
         return AsyncPlacementGroupsResource(self._client)
 
     @cached_property
@@ -544,6 +550,9 @@ class CloudResourceWithRawResponse:
 
     @cached_property
     def placement_groups(self) -> PlacementGroupsResourceWithRawResponse:
+        """
+        Placement Groups allow you to specific a policy that determines whether Virtual Machines will be hosted on the same physical server or on different ones.
+        """
         return PlacementGroupsResourceWithRawResponse(self._cloud.placement_groups)
 
     @cached_property
@@ -657,6 +666,9 @@ class AsyncCloudResourceWithRawResponse:
 
     @cached_property
     def placement_groups(self) -> AsyncPlacementGroupsResourceWithRawResponse:
+        """
+        Placement Groups allow you to specific a policy that determines whether Virtual Machines will be hosted on the same physical server or on different ones.
+        """
         return AsyncPlacementGroupsResourceWithRawResponse(self._cloud.placement_groups)
 
     @cached_property
@@ -770,6 +782,9 @@ class CloudResourceWithStreamingResponse:
 
     @cached_property
     def placement_groups(self) -> PlacementGroupsResourceWithStreamingResponse:
+        """
+        Placement Groups allow you to specific a policy that determines whether Virtual Machines will be hosted on the same physical server or on different ones.
+        """
         return PlacementGroupsResourceWithStreamingResponse(self._cloud.placement_groups)
 
     @cached_property
@@ -883,6 +898,9 @@ class AsyncCloudResourceWithStreamingResponse:
 
     @cached_property
     def placement_groups(self) -> AsyncPlacementGroupsResourceWithStreamingResponse:
+        """
+        Placement Groups allow you to specific a policy that determines whether Virtual Machines will be hosted on the same physical server or on different ones.
+        """
         return AsyncPlacementGroupsResourceWithStreamingResponse(self._cloud.placement_groups)
 
     @cached_property