feat(api): clean up indirect models

api.md

@@ -89,23 +89,16 @@ Methods:
 Types:
 
 ```python
-from cloudflare.types.accounts import (
-    TokenCreateResponse,
-    TokenUpdateResponse,
-    TokenListResponse,
-    TokenDeleteResponse,
-    TokenGetResponse,
-    TokenVerifyResponse,
-)
+from cloudflare.types.accounts import TokenCreateResponse, TokenDeleteResponse, TokenVerifyResponse
 ```
 
 Methods:
 
 - <code title="post /accounts/{account_id}/tokens">client.accounts.tokens.<a href="./src/cloudflare/resources/accounts/tokens/tokens.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/accounts/token_create_params.py">params</a>) -> <a href="./src/cloudflare/types/accounts/token_create_response.py">Optional</a></code>
-- <code title="put /accounts/{account_id}/tokens/{token_id}">client.accounts.tokens.<a href="./src/cloudflare/resources/accounts/tokens/tokens.py">update</a>(token_id, \*, account_id, \*\*<a href="src/cloudflare/types/accounts/token_update_params.py">params</a>) -> <a href="./src/cloudflare/types/accounts/token_update_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/tokens">client.accounts.tokens.<a href="./src/cloudflare/resources/accounts/tokens/tokens.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/accounts/token_list_params.py">params</a>) -> <a href="./src/cloudflare/types/accounts/token_list_response.py">SyncV4PagePaginationArray[TokenListResponse]</a></code>
+- <code title="put /accounts/{account_id}/tokens/{token_id}">client.accounts.tokens.<a href="./src/cloudflare/resources/accounts/tokens/tokens.py">update</a>(token_id, \*, account_id, \*\*<a href="src/cloudflare/types/accounts/token_update_params.py">params</a>) -> <a href="./src/cloudflare/types/user/token.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/tokens">client.accounts.tokens.<a href="./src/cloudflare/resources/accounts/tokens/tokens.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/accounts/token_list_params.py">params</a>) -> <a href="./src/cloudflare/types/user/token.py">SyncV4PagePaginationArray[Token]</a></code>
 - <code title="delete /accounts/{account_id}/tokens/{token_id}">client.accounts.tokens.<a href="./src/cloudflare/resources/accounts/tokens/tokens.py">delete</a>(token_id, \*, account_id) -> <a href="./src/cloudflare/types/accounts/token_delete_response.py">Optional</a></code>
-- <code title="get /accounts/{account_id}/tokens/{token_id}">client.accounts.tokens.<a href="./src/cloudflare/resources/accounts/tokens/tokens.py">get</a>(token_id, \*, account_id) -> <a href="./src/cloudflare/types/accounts/token_get_response.py">Optional</a></code>
+- <code title="get /accounts/{account_id}/tokens/{token_id}">client.accounts.tokens.<a href="./src/cloudflare/resources/accounts/tokens/tokens.py">get</a>(token_id, \*, account_id) -> <a href="./src/cloudflare/types/user/token.py">Optional</a></code>
 - <code title="get /accounts/{account_id}/tokens/verify">client.accounts.tokens.<a href="./src/cloudflare/resources/accounts/tokens/tokens.py">verify</a>(\*, account_id) -> <a href="./src/cloudflare/types/accounts/token_verify_response.py">Optional</a></code>
 
 ### PermissionGroups
@@ -277,21 +270,18 @@ from cloudflare.types.user import (
     Policy,
     Token,
     TokenCreateResponse,
-    TokenUpdateResponse,
-    TokenListResponse,
     TokenDeleteResponse,
-    TokenGetResponse,
     TokenVerifyResponse,
 )
 ```
 
 Methods:
 
 - <code title="post /user/tokens">client.user.tokens.<a href="./src/cloudflare/resources/user/tokens/tokens.py">create</a>(\*\*<a href="src/cloudflare/types/user/token_create_params.py">params</a>) -> <a href="./src/cloudflare/types/user/token_create_response.py">Optional</a></code>
-- <code title="put /user/tokens/{token_id}">client.user.tokens.<a href="./src/cloudflare/resources/user/tokens/tokens.py">update</a>(token_id, \*\*<a href="src/cloudflare/types/user/token_update_params.py">params</a>) -> <a href="./src/cloudflare/types/user/token_update_response.py">Optional</a></code>
-- <code title="get /user/tokens">client.user.tokens.<a href="./src/cloudflare/resources/user/tokens/tokens.py">list</a>(\*\*<a href="src/cloudflare/types/user/token_list_params.py">params</a>) -> <a href="./src/cloudflare/types/user/token_list_response.py">SyncV4PagePaginationArray[TokenListResponse]</a></code>
+- <code title="put /user/tokens/{token_id}">client.user.tokens.<a href="./src/cloudflare/resources/user/tokens/tokens.py">update</a>(token_id, \*\*<a href="src/cloudflare/types/user/token_update_params.py">params</a>) -> <a href="./src/cloudflare/types/user/token.py">Optional</a></code>
+- <code title="get /user/tokens">client.user.tokens.<a href="./src/cloudflare/resources/user/tokens/tokens.py">list</a>(\*\*<a href="src/cloudflare/types/user/token_list_params.py">params</a>) -> <a href="./src/cloudflare/types/user/token.py">SyncV4PagePaginationArray[Token]</a></code>
 - <code title="delete /user/tokens/{token_id}">client.user.tokens.<a href="./src/cloudflare/resources/user/tokens/tokens.py">delete</a>(token_id) -> <a href="./src/cloudflare/types/user/token_delete_response.py">Optional</a></code>
-- <code title="get /user/tokens/{token_id}">client.user.tokens.<a href="./src/cloudflare/resources/user/tokens/tokens.py">get</a>(token_id) -> <a href="./src/cloudflare/types/user/token_get_response.py">Optional</a></code>
+- <code title="get /user/tokens/{token_id}">client.user.tokens.<a href="./src/cloudflare/resources/user/tokens/tokens.py">get</a>(token_id) -> <a href="./src/cloudflare/types/user/token.py">Optional</a></code>
 - <code title="get /user/tokens/verify">client.user.tokens.<a href="./src/cloudflare/resources/user/tokens/tokens.py">verify</a>() -> <a href="./src/cloudflare/types/user/token_verify_response.py">Optional</a></code>
 
 ### PermissionGroups

src/cloudflare/resources/accounts/tokens/tokens.py

@@ -41,12 +41,10 @@
     PermissionGroupsResourceWithStreamingResponse,
     AsyncPermissionGroupsResourceWithStreamingResponse,
 )
+from ....types.user.token import Token
 from ....types.user.policy_param import PolicyParam
-from ....types.accounts.token_get_response import TokenGetResponse
-from ....types.accounts.token_list_response import TokenListResponse
 from ....types.accounts.token_create_response import TokenCreateResponse
 from ....types.accounts.token_delete_response import TokenDeleteResponse
-from ....types.accounts.token_update_response import TokenUpdateResponse
 from ....types.accounts.token_verify_response import TokenVerifyResponse
 
 __all__ = ["TokensResource", "AsyncTokensResource"]
@@ -160,7 +158,7 @@ def update(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[TokenUpdateResponse]:
+    ) -> Optional[Token]:
         """
         Update an existing token.
 
@@ -210,9 +208,9 @@ def update(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[TokenUpdateResponse]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Token]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[TokenUpdateResponse]], ResultWrapper[TokenUpdateResponse]),
+            cast_to=cast(Type[Optional[Token]], ResultWrapper[Token]),
         )
 
     def list(
@@ -228,7 +226,7 @@ def list(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncV4PagePaginationArray[TokenListResponse]:
+    ) -> SyncV4PagePaginationArray[Token]:
         """
         List all Account Owned API tokens created for this account.
 
@@ -253,7 +251,7 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/tokens",
-            page=SyncV4PagePaginationArray[TokenListResponse],
+            page=SyncV4PagePaginationArray[Token],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -268,7 +266,7 @@ def list(
                     token_list_params.TokenListParams,
                 ),
             ),
-            model=TokenListResponse,
+            model=Token,
         )
 
     def delete(
@@ -326,7 +324,7 @@ def get(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[TokenGetResponse]:
+    ) -> Optional[Token]:
         """
         Get information about a specific Account Owned API token.
 
@@ -354,9 +352,9 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[TokenGetResponse]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Token]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[TokenGetResponse]], ResultWrapper[TokenGetResponse]),
+            cast_to=cast(Type[Optional[Token]], ResultWrapper[Token]),
         )
 
     def verify(
@@ -507,7 +505,7 @@ async def update(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[TokenUpdateResponse]:
+    ) -> Optional[Token]:
         """
         Update an existing token.
 
@@ -557,9 +555,9 @@ async def update(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[TokenUpdateResponse]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Token]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[TokenUpdateResponse]], ResultWrapper[TokenUpdateResponse]),
+            cast_to=cast(Type[Optional[Token]], ResultWrapper[Token]),
         )
 
     def list(
@@ -575,7 +573,7 @@ def list(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[TokenListResponse, AsyncV4PagePaginationArray[TokenListResponse]]:
+    ) -> AsyncPaginator[Token, AsyncV4PagePaginationArray[Token]]:
         """
         List all Account Owned API tokens created for this account.
 
@@ -600,7 +598,7 @@ def list(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         return self._get_api_list(
             f"/accounts/{account_id}/tokens",
-            page=AsyncV4PagePaginationArray[TokenListResponse],
+            page=AsyncV4PagePaginationArray[Token],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -615,7 +613,7 @@ def list(
                     token_list_params.TokenListParams,
                 ),
             ),
-            model=TokenListResponse,
+            model=Token,
         )
 
     async def delete(
@@ -673,7 +671,7 @@ async def get(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[TokenGetResponse]:
+    ) -> Optional[Token]:
         """
         Get information about a specific Account Owned API token.
 
@@ -701,9 +699,9 @@ async def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[TokenGetResponse]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Token]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[TokenGetResponse]], ResultWrapper[TokenGetResponse]),
+            cast_to=cast(Type[Optional[Token]], ResultWrapper[Token]),
         )
 
     async def verify(

src/cloudflare/resources/user/tokens/tokens.py

@@ -41,12 +41,10 @@
     PermissionGroupsResourceWithStreamingResponse,
     AsyncPermissionGroupsResourceWithStreamingResponse,
 )
+from ....types.user.token import Token
 from ....types.user.policy_param import PolicyParam
-from ....types.user.token_get_response import TokenGetResponse
-from ....types.user.token_list_response import TokenListResponse
 from ....types.user.token_create_response import TokenCreateResponse
 from ....types.user.token_delete_response import TokenDeleteResponse
-from ....types.user.token_update_response import TokenUpdateResponse
 from ....types.user.token_verify_response import TokenVerifyResponse
 
 __all__ = ["TokensResource", "AsyncTokensResource"]
@@ -154,7 +152,7 @@ def update(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[TokenUpdateResponse]:
+    ) -> Optional[Token]:
         """
         Update an existing token.
 
@@ -200,9 +198,9 @@ def update(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[TokenUpdateResponse]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Token]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[TokenUpdateResponse]], ResultWrapper[TokenUpdateResponse]),
+            cast_to=cast(Type[Optional[Token]], ResultWrapper[Token]),
         )
 
     def list(
@@ -217,7 +215,7 @@ def list(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncV4PagePaginationArray[TokenListResponse]:
+    ) -> SyncV4PagePaginationArray[Token]:
         """
         List all access tokens you created.
 
@@ -238,7 +236,7 @@ def list(
         """
         return self._get_api_list(
             "/user/tokens",
-            page=SyncV4PagePaginationArray[TokenListResponse],
+            page=SyncV4PagePaginationArray[Token],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -253,7 +251,7 @@ def list(
                     token_list_params.TokenListParams,
                 ),
             ),
-            model=TokenListResponse,
+            model=Token,
         )
 
     def delete(
@@ -305,7 +303,7 @@ def get(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[TokenGetResponse]:
+    ) -> Optional[Token]:
         """
         Get information about a specific token.
 
@@ -329,9 +327,9 @@ def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[TokenGetResponse]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Token]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[TokenGetResponse]], ResultWrapper[TokenGetResponse]),
+            cast_to=cast(Type[Optional[Token]], ResultWrapper[Token]),
         )
 
     def verify(
@@ -460,7 +458,7 @@ async def update(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[TokenUpdateResponse]:
+    ) -> Optional[Token]:
         """
         Update an existing token.
 
@@ -506,9 +504,9 @@ async def update(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[TokenUpdateResponse]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Token]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[TokenUpdateResponse]], ResultWrapper[TokenUpdateResponse]),
+            cast_to=cast(Type[Optional[Token]], ResultWrapper[Token]),
         )
 
     def list(
@@ -523,7 +521,7 @@ def list(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[TokenListResponse, AsyncV4PagePaginationArray[TokenListResponse]]:
+    ) -> AsyncPaginator[Token, AsyncV4PagePaginationArray[Token]]:
         """
         List all access tokens you created.
 
@@ -544,7 +542,7 @@ def list(
         """
         return self._get_api_list(
             "/user/tokens",
-            page=AsyncV4PagePaginationArray[TokenListResponse],
+            page=AsyncV4PagePaginationArray[Token],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -559,7 +557,7 @@ def list(
                     token_list_params.TokenListParams,
                 ),
             ),
-            model=TokenListResponse,
+            model=Token,
         )
 
     async def delete(
@@ -611,7 +609,7 @@ async def get(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[TokenGetResponse]:
+    ) -> Optional[Token]:
         """
         Get information about a specific token.
 
@@ -635,9 +633,9 @@ async def get(
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper[Optional[TokenGetResponse]]._unwrapper,
+                post_parser=ResultWrapper[Optional[Token]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[TokenGetResponse]], ResultWrapper[TokenGetResponse]),
+            cast_to=cast(Type[Optional[Token]], ResultWrapper[Token]),
         )
 
     async def verify(

src/cloudflare/types/accounts/__init__.py

@@ -6,18 +6,15 @@
 from .account import Account as Account
 from .token_list_params import TokenListParams as TokenListParams
 from .member_list_params import MemberListParams as MemberListParams
-from .token_get_response import TokenGetResponse as TokenGetResponse
 from .account_list_params import AccountListParams as AccountListParams
 from .token_create_params import TokenCreateParams as TokenCreateParams
-from .token_list_response import TokenListResponse as TokenListResponse
 from .token_update_params import TokenUpdateParams as TokenUpdateParams
 from .member_create_params import MemberCreateParams as MemberCreateParams
 from .member_update_params import MemberUpdateParams as MemberUpdateParams
 from .account_create_params import AccountCreateParams as AccountCreateParams
 from .account_update_params import AccountUpdateParams as AccountUpdateParams
 from .token_create_response import TokenCreateResponse as TokenCreateResponse
 from .token_delete_response import TokenDeleteResponse as TokenDeleteResponse
-from .token_update_response import TokenUpdateResponse as TokenUpdateResponse
 from .token_verify_response import TokenVerifyResponse as TokenVerifyResponse
 from .member_delete_response import MemberDeleteResponse as MemberDeleteResponse
 from .account_delete_response import AccountDeleteResponse as AccountDeleteResponse