feat: update via SDK Studio (#105)

cloudflare · Mar 12, 2024 · 7c51aa2 · 7c51aa2
1 parent ee72c2f
commit 7c51aa2
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 87 deletions.
diff --git a/api.md b/api.md
@@ -2920,12 +2920,12 @@ Methods:
 Types:
 
 ```python
-from cloudflare.types.kv.namespaces import WorkersKVKey, KeyListResponse
+from cloudflare.types.kv.namespaces import WorkersKVKey
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/keys">client.kv.namespaces.keys.<a href="./src/cloudflare/resources/kv/namespaces/keys.py">list</a>(namespace_id, \*, account_id, \*\*<a href="src/cloudflare/types/kv/namespaces/key_list_params.py">params</a>) -> <a href="./src/cloudflare/types/kv/namespaces/key_list_response.py">KeyListResponse</a></code>
+- <code title="get /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/keys">client.kv.namespaces.keys.<a href="./src/cloudflare/resources/kv/namespaces/keys.py">list</a>(namespace_id, \*, account_id, \*\*<a href="src/cloudflare/types/kv/namespaces/key_list_params.py">params</a>) -> <a href="./src/cloudflare/types/kv/namespaces/workers_kv_key.py">SyncCursorPagination[WorkersKVKey]</a></code>
 
 ### Metadata
 
@@ -2976,12 +2976,12 @@ Methods:
 Types:
 
 ```python
-from cloudflare.types.durable_objects.namespaces import WorkersObject, ObjectListResponse
+from cloudflare.types.durable_objects.namespaces import WorkersObject
 ```
 
 Methods:
 
-- <code title="get /accounts/{account_id}/workers/durable_objects/namespaces/{id}/objects">client.durable_objects.namespaces.objects.<a href="./src/cloudflare/resources/durable_objects/namespaces/objects.py">list</a>(id, \*, account_id, \*\*<a href="src/cloudflare/types/durable_objects/namespaces/object_list_params.py">params</a>) -> <a href="./src/cloudflare/types/durable_objects/namespaces/object_list_response.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/workers/durable_objects/namespaces/{id}/objects">client.durable_objects.namespaces.objects.<a href="./src/cloudflare/resources/durable_objects/namespaces/objects.py">list</a>(id, \*, account_id, \*\*<a href="src/cloudflare/types/durable_objects/namespaces/object_list_params.py">params</a>) -> <a href="./src/cloudflare/types/durable_objects/namespaces/workers_object.py">SyncCursorPagination[WorkersObject]</a></code>
 
 # Queues
 

diff --git a/src/cloudflare/pagination.py b/src/cloudflare/pagination.py
@@ -151,15 +151,15 @@ class CursorPaginationResultInfo(BaseModel):
 
 
 class SyncCursorPagination(BaseSyncPage[_T], BasePage[_T], Generic[_T]):
-    result: Optional[object] = None
+    result: List[_T]
     result_info: Optional[CursorPaginationResultInfo] = None
 
     @override
     def _get_page_items(self) -> List[_T]:
-        data = self.data
-        if not data:
+        result = self.result
+        if not result:
             return []
-        return data
+        return result
 
     @override
     def next_page_info(self) -> Optional[PageInfo]:
@@ -173,15 +173,15 @@ def next_page_info(self) -> Optional[PageInfo]:
 
 
 class AsyncCursorPagination(BaseAsyncPage[_T], BasePage[_T], Generic[_T]):
-    result: Optional[object] = None
+    result: List[_T]
     result_info: Optional[CursorPaginationResultInfo] = None
 
     @override
     def _get_page_items(self) -> List[_T]:
-        data = self.data
-        if not data:
+        result = self.result
+        if not result:
             return []
-        return data
+        return result
 
     @override
     def next_page_info(self) -> Optional[PageInfo]:

diff --git a/src/cloudflare/resources/durable_objects/namespaces/objects.py b/src/cloudflare/resources/durable_objects/namespaces/objects.py
@@ -2,15 +2,10 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
-
 import httpx
 
 from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._utils import maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -19,11 +14,12 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ...._wrappers import ResultWrapper
+from ....pagination import SyncCursorPagination, AsyncCursorPagination
 from ...._base_client import (
+    AsyncPaginator,
     make_request_options,
 )
-from ....types.durable_objects.namespaces import ObjectListResponse, object_list_params
+from ....types.durable_objects.namespaces import WorkersObject, object_list_params
 
 __all__ = ["Objects", "AsyncObjects"]
 
@@ -50,7 +46,7 @@ def list(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ObjectListResponse]:
+    ) -> SyncCursorPagination[WorkersObject]:
         """
         Returns the Durable Objects in a given namespace.
 
@@ -78,8 +74,9 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not id:
             raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
-        return self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/workers/durable_objects/namespaces/{id}/objects",
+            page=SyncCursorPagination[WorkersObject],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -92,9 +89,8 @@ def list(
                     },
                     object_list_params.ObjectListParams,
                 ),
-                post_parser=ResultWrapper._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ObjectListResponse]], ResultWrapper[ObjectListResponse]),
+            model=WorkersObject,
         )
 
 
@@ -107,7 +103,7 @@ def with_raw_response(self) -> AsyncObjectsWithRawResponse:
     def with_streaming_response(self) -> AsyncObjectsWithStreamingResponse:
         return AsyncObjectsWithStreamingResponse(self)
 
-    async def list(
+    def list(
         self,
         id: str,
         *,
@@ -120,7 +116,7 @@ async def list(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ObjectListResponse]:
+    ) -> AsyncPaginator[WorkersObject, AsyncCursorPagination[WorkersObject]]:
         """
         Returns the Durable Objects in a given namespace.
 
@@ -148,23 +144,23 @@ async def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not id:
             raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
-        return await self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/workers/durable_objects/namespaces/{id}/objects",
+            page=AsyncCursorPagination[WorkersObject],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                query=await async_maybe_transform(
+                query=maybe_transform(
                     {
                         "cursor": cursor,
                         "limit": limit,
                     },
                     object_list_params.ObjectListParams,
                 ),
-                post_parser=ResultWrapper._unwrapper,
             ),
-            cast_to=cast(Type[Optional[ObjectListResponse]], ResultWrapper[ObjectListResponse]),
+            model=WorkersObject,
         )
 
 

diff --git a/src/cloudflare/resources/kv/namespaces/keys.py b/src/cloudflare/resources/kv/namespaces/keys.py
@@ -2,15 +2,10 @@
 
 from __future__ import annotations
 
-from typing import Type, cast
-
 import httpx
 
 from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._utils import maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -19,11 +14,12 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ...._wrappers import ResultWrapper
+from ....pagination import SyncCursorPagination, AsyncCursorPagination
 from ...._base_client import (
+    AsyncPaginator,
     make_request_options,
 )
-from ....types.kv.namespaces import KeyListResponse, key_list_params
+from ....types.kv.namespaces import WorkersKVKey, key_list_params
 
 __all__ = ["Keys", "AsyncKeys"]
 
@@ -51,7 +47,7 @@ def list(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> KeyListResponse:
+    ) -> SyncCursorPagination[WorkersKVKey]:
         """
         Lists a namespace's keys.
 
@@ -83,8 +79,9 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not namespace_id:
             raise ValueError(f"Expected a non-empty value for `namespace_id` but received {namespace_id!r}")
-        return self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/storage/kv/namespaces/{namespace_id}/keys",
+            page=SyncCursorPagination[WorkersKVKey],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -98,9 +95,8 @@ def list(
                     },
                     key_list_params.KeyListParams,
                 ),
-                post_parser=ResultWrapper._unwrapper,
             ),
-            cast_to=cast(Type[KeyListResponse], ResultWrapper[KeyListResponse]),
+            model=WorkersKVKey,
         )
 
 
@@ -113,7 +109,7 @@ def with_raw_response(self) -> AsyncKeysWithRawResponse:
     def with_streaming_response(self) -> AsyncKeysWithStreamingResponse:
         return AsyncKeysWithStreamingResponse(self)
 
-    async def list(
+    def list(
         self,
         namespace_id: str,
         *,
@@ -127,7 +123,7 @@ async def list(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> KeyListResponse:
+    ) -> AsyncPaginator[WorkersKVKey, AsyncCursorPagination[WorkersKVKey]]:
         """
         Lists a namespace's keys.
 
@@ -159,24 +155,24 @@ async def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not namespace_id:
             raise ValueError(f"Expected a non-empty value for `namespace_id` but received {namespace_id!r}")
-        return await self._get(
+        return self._get_api_list(
             f"/accounts/{account_id}/storage/kv/namespaces/{namespace_id}/keys",
+            page=AsyncCursorPagination[WorkersKVKey],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                query=await async_maybe_transform(
+                query=maybe_transform(
                     {
                         "cursor": cursor,
                         "limit": limit,
                         "prefix": prefix,
                     },
                     key_list_params.KeyListParams,
                 ),
-                post_parser=ResultWrapper._unwrapper,
             ),
-            cast_to=cast(Type[KeyListResponse], ResultWrapper[KeyListResponse]),
+            model=WorkersKVKey,
         )
 
 

diff --git a/src/cloudflare/types/durable_objects/namespaces/__init__.py b/src/cloudflare/types/durable_objects/namespaces/__init__.py
@@ -4,4 +4,3 @@
 
 from .workers_object import WorkersObject as WorkersObject
 from .object_list_params import ObjectListParams as ObjectListParams
-from .object_list_response import ObjectListResponse as ObjectListResponse
diff --git a/src/cloudflare/types/durable_objects/namespaces/object_list_response.py b/src/cloudflare/types/durable_objects/namespaces/object_list_response.py
diff --git a/src/cloudflare/types/kv/namespaces/__init__.py b/src/cloudflare/types/kv/namespaces/__init__.py
@@ -4,7 +4,6 @@
 
 from .workers_kv_key import WorkersKVKey as WorkersKVKey
 from .key_list_params import KeyListParams as KeyListParams
-from .key_list_response import KeyListResponse as KeyListResponse
 from .bulk_delete_params import BulkDeleteParams as BulkDeleteParams
 from .bulk_update_params import BulkUpdateParams as BulkUpdateParams
 from .value_get_response import ValueGetResponse as ValueGetResponse

diff --git a/src/cloudflare/types/kv/namespaces/key_list_response.py b/src/cloudflare/types/kv/namespaces/key_list_response.py