feat(api): update via SDK Studio (#187)

Author: stainless-app[bot]

api.md

@@ -1,11 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Any, List, Type, Generic, Mapping, TypeVar, Optional, cast
+from typing import List, Generic, TypeVar, Optional, cast
 from typing_extensions import override
 
-from httpx import Response
-
-from ._utils import is_mapping
 from ._models import BaseModel, GenericModel
 from ._base_client import BasePage, PageInfo, BaseSyncPage, BaseAsyncPage
 
@@ -27,8 +24,6 @@
     "AsyncSinglePage",
 ]
 
-_BaseModelT = TypeVar("_BaseModelT", bound=BaseModel)
-
 _T = TypeVar("_T")
 
 
@@ -257,14 +252,14 @@ def next_page_info(self) -> Optional[PageInfo]:
 
 
 class SyncSinglePage(BaseSyncPage[_T], BasePage[_T], Generic[_T]):
-    items: List[_T]
+    result: List[_T]
 
     @override
     def _get_page_items(self) -> List[_T]:
-        items = self.items
-        if not items:
+        result = self.result
+        if not result:
             return []
-        return items
+        return result
 
     @override
     def next_page_info(self) -> None:
@@ -274,25 +269,16 @@ def next_page_info(self) -> None:
         """
         return None
 
-    @classmethod
-    def build(cls: Type[_BaseModelT], *, response: Response, data: object) -> _BaseModelT:  # noqa: ARG003
-        return cls.construct(
-            None,
-            **{
-                **(cast(Mapping[str, Any], data) if is_mapping(data) else {"items": data}),
-            },
-        )
-
 
 class AsyncSinglePage(BaseAsyncPage[_T], BasePage[_T], Generic[_T]):
-    items: List[_T]
+    result: List[_T]
 
     @override
     def _get_page_items(self) -> List[_T]:
-        items = self.items
-        if not items:
+        result = self.result
+        if not result:
             return []
-        return items
+        return result
 
     @override
     def next_page_info(self) -> None:
@@ -301,12 +287,3 @@ def next_page_info(self) -> None:
         so there will never be a next page.
         """
         return None
-
-    @classmethod
-    def build(cls: Type[_BaseModelT], *, response: Response, data: object) -> _BaseModelT:  # noqa: ARG003
-        return cls.construct(
-            None,
-            **{
-                **(cast(Mapping[str, Any], data) if is_mapping(data) else {"items": data}),
-            },
-        )

src/cloudflare/pagination.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Any, Type, Optional, cast
+from typing import Any, cast
 
 import httpx
 
@@ -16,10 +16,12 @@
     async_to_streamed_response_wrapper,
 )
 from ..._wrappers import ResultWrapper
+from ...pagination import SyncSinglePage, AsyncSinglePage
 from ..._base_client import (
+    AsyncPaginator,
     make_request_options,
 )
-from ...types.accounts import RoleGetResponse, RoleListResponse
+from ...types.accounts import Role, RoleGetResponse
 
 __all__ = ["Roles", "AsyncRoles"]
 
@@ -43,7 +45,7 @@ def list(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[RoleListResponse]:
+    ) -> SyncSinglePage[Role]:
         """
         Get all available roles for an account.
 
@@ -56,16 +58,13 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/roles",
+            page=SyncSinglePage[Role],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[RoleListResponse]], ResultWrapper[RoleListResponse]),
+            model=Role,
         )
 
     def get(
@@ -119,7 +118,7 @@ def with_raw_response(self) -> AsyncRolesWithRawResponse:
     def with_streaming_response(self) -> AsyncRolesWithStreamingResponse:
         return AsyncRolesWithStreamingResponse(self)
 
-    async def list(
+    def list(
         self,
         *,
         account_id: object,
@@ -129,7 +128,7 @@ async def list(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[RoleListResponse]:
+    ) -> AsyncPaginator[Role, AsyncSinglePage[Role]]:
         """
         Get all available roles for an account.
 
@@ -142,16 +141,13 @@ async def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return await self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/roles",
+            page=AsyncSinglePage[Role],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[RoleListResponse]], ResultWrapper[RoleListResponse]),
+            model=Role,
         )
 
     async def get(

src/cloudflare/resources/accounts/roles.py

@@ -44,13 +44,14 @@
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
+from ....pagination import SyncSinglePage, AsyncSinglePage
 from ...._base_client import (
+    AsyncPaginator,
     make_request_options,
 )
 from ....types.addressing import (
     AddressingAddressMaps,
     AddressMapGetResponse,
-    AddressMapListResponse,
     AddressMapCreateResponse,
     AddressMapDeleteResponse,
     address_map_edit_params,
@@ -145,7 +146,7 @@ def list(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AddressMapListResponse]:
+    ) -> SyncSinglePage[AddressingAddressMaps]:
         """
         List all address maps owned by the account.
 
@@ -162,16 +163,13 @@ def list(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/addressing/address_maps",
+            page=SyncSinglePage[AddressingAddressMaps],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[AddressMapListResponse]], ResultWrapper[AddressMapListResponse]),
+            model=AddressingAddressMaps,
         )
 
     def delete(
@@ -412,7 +410,7 @@ async def create(
             cast_to=cast(Type[AddressMapCreateResponse], ResultWrapper[AddressMapCreateResponse]),
         )
 
-    async def list(
+    def list(
         self,
         *,
         account_id: str,
@@ -422,7 +420,7 @@ async def list(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AddressMapListResponse]:
+    ) -> AsyncPaginator[AddressingAddressMaps, AsyncSinglePage[AddressingAddressMaps]]:
         """
         List all address maps owned by the account.
 
@@ -439,16 +437,13 @@ async def list(
         """
         if not account_id:
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
-        return await self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/addressing/address_maps",
+            page=AsyncSinglePage[AddressingAddressMaps],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[AddressMapListResponse]], ResultWrapper[AddressMapListResponse]),
+            model=AddressingAddressMaps,
         )
 
     async def delete(

src/cloudflare/resources/addressing/address_maps/address_maps.py

@@ -20,15 +20,12 @@
     async_to_streamed_response_wrapper,
 )
 from ....._wrappers import ResultWrapper
+from .....pagination import SyncSinglePage, AsyncSinglePage
 from ....._base_client import (
+    AsyncPaginator,
     make_request_options,
 )
-from .....types.addressing.prefixes.bgp import (
-    BindingListResponse,
-    BindingDeleteResponse,
-    AddressingServiceBinding,
-    binding_create_params,
-)
+from .....types.addressing.prefixes.bgp import BindingDeleteResponse, AddressingServiceBinding, binding_create_params
 
 __all__ = ["Bindings", "AsyncBindings"]
 
@@ -113,7 +110,7 @@ def list(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> BindingListResponse:
+    ) -> SyncSinglePage[AddressingServiceBinding]:
         """List the Cloudflare services this prefix is currently bound to.
 
         Traffic sent to
@@ -140,16 +137,13 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not prefix_id:
             raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
-        return self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings",
+            page=SyncSinglePage[AddressingServiceBinding],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[BindingListResponse], ResultWrapper[BindingListResponse]),
+            model=AddressingServiceBinding,
         )
 
     def delete(
@@ -325,7 +319,7 @@ async def create(
             cast_to=cast(Type[AddressingServiceBinding], ResultWrapper[AddressingServiceBinding]),
         )
 
-    async def list(
+    def list(
         self,
         prefix_id: str,
         *,
@@ -336,7 +330,7 @@ async def list(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> BindingListResponse:
+    ) -> AsyncPaginator[AddressingServiceBinding, AsyncSinglePage[AddressingServiceBinding]]:
         """List the Cloudflare services this prefix is currently bound to.
 
         Traffic sent to
@@ -363,16 +357,13 @@ async def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not prefix_id:
             raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}")
-        return await self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings",
+            page=AsyncSinglePage[AddressingServiceBinding],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[BindingListResponse], ResultWrapper[BindingListResponse]),
+            model=AddressingServiceBinding,
         )
 
     async def delete(