Skip to content

Commit dea3ac6

Browse files
stainless-app[bot]stainless-app[bot]
authored
feat(api): clean up indirect models (#2155)
1 parent a447e5b commit dea3ac6

13 files changed

Lines changed: 94 additions & 417 deletions

File tree

‎api.md‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -89,23 +89,16 @@ Methods:
8989
Types:
9090

9191
```python
92-
from cloudflare.types.accounts import (
93-
TokenCreateResponse,
94-
TokenUpdateResponse,
95-
TokenListResponse,
96-
TokenDeleteResponse,
97-
TokenGetResponse,
98-
TokenVerifyResponse,
99-
)
92+
from cloudflare.types.accounts import TokenCreateResponse, TokenDeleteResponse, TokenVerifyResponse
10093
```
10194

10295
Methods:
10396

10497
- <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>
105-
- <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>
106-
- <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>
98+
- <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>
99+
- <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>
107100
- <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>
108-
- <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>
101+
- <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>
109102
- <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>
110103

111104
### PermissionGroups
@@ -277,21 +270,18 @@ from cloudflare.types.user import (
277270
Policy,
278271
Token,
279272
TokenCreateResponse,
280-
TokenUpdateResponse,
281-
TokenListResponse,
282273
TokenDeleteResponse,
283-
TokenGetResponse,
284274
TokenVerifyResponse,
285275
)
286276
```
287277

288278
Methods:
289279

290280
- <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>
291-
- <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>
292-
- <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>
281+
- <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>
282+
- <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>
293283
- <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>
294-
- <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>
284+
- <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>
295285
- <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>
296286

297287
### PermissionGroups

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

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,10 @@
4141
PermissionGroupsResourceWithStreamingResponse,
4242
AsyncPermissionGroupsResourceWithStreamingResponse,
4343
)
44+
from ....types.user.token import Token
4445
from ....types.user.policy_param import PolicyParam
45-
from ....types.accounts.token_get_response import TokenGetResponse
46-
from ....types.accounts.token_list_response import TokenListResponse
4746
from ....types.accounts.token_create_response import TokenCreateResponse
4847
from ....types.accounts.token_delete_response import TokenDeleteResponse
49-
from ....types.accounts.token_update_response import TokenUpdateResponse
5048
from ....types.accounts.token_verify_response import TokenVerifyResponse
5149

5250
__all__ = ["TokensResource", "AsyncTokensResource"]
@@ -160,7 +158,7 @@ def update(
160158
extra_query: Query | None = None,
161159
extra_body: Body | None = None,
162160
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
163-
) -> Optional[TokenUpdateResponse]:
161+
) -> Optional[Token]:
164162
"""
165163
Update an existing token.
166164
@@ -210,9 +208,9 @@ def update(
210208
extra_query=extra_query,
211209
extra_body=extra_body,
212210
timeout=timeout,
213-
post_parser=ResultWrapper[Optional[TokenUpdateResponse]]._unwrapper,
211+
post_parser=ResultWrapper[Optional[Token]]._unwrapper,
214212
),
215-
cast_to=cast(Type[Optional[TokenUpdateResponse]], ResultWrapper[TokenUpdateResponse]),
213+
cast_to=cast(Type[Optional[Token]], ResultWrapper[Token]),
216214
)
217215

218216
def list(
@@ -228,7 +226,7 @@ def list(
228226
extra_query: Query | None = None,
229227
extra_body: Body | None = None,
230228
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
231-
) -> SyncV4PagePaginationArray[TokenListResponse]:
229+
) -> SyncV4PagePaginationArray[Token]:
232230
"""
233231
List all Account Owned API tokens created for this account.
234232
@@ -253,7 +251,7 @@ def list(
253251
raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
254252
return self._get_api_list(
255253
f"/accounts/{account_id}/tokens",
256-
page=SyncV4PagePaginationArray[TokenListResponse],
254+
page=SyncV4PagePaginationArray[Token],
257255
options=make_request_options(
258256
extra_headers=extra_headers,
259257
extra_query=extra_query,
@@ -268,7 +266,7 @@ def list(
268266
token_list_params.TokenListParams,
269267
),
270268
),
271-
model=TokenListResponse,
269+
model=Token,
272270
)
273271

274272
def delete(
@@ -326,7 +324,7 @@ def get(
326324
extra_query: Query | None = None,
327325
extra_body: Body | None = None,
328326
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
329-
) -> Optional[TokenGetResponse]:
327+
) -> Optional[Token]:
330328
"""
331329
Get information about a specific Account Owned API token.
332330
@@ -354,9 +352,9 @@ def get(
354352
extra_query=extra_query,
355353
extra_body=extra_body,
356354
timeout=timeout,
357-
post_parser=ResultWrapper[Optional[TokenGetResponse]]._unwrapper,
355+
post_parser=ResultWrapper[Optional[Token]]._unwrapper,
358356
),
359-
cast_to=cast(Type[Optional[TokenGetResponse]], ResultWrapper[TokenGetResponse]),
357+
cast_to=cast(Type[Optional[Token]], ResultWrapper[Token]),
360358
)
361359

362360
def verify(
@@ -507,7 +505,7 @@ async def update(
507505
extra_query: Query | None = None,
508506
extra_body: Body | None = None,
509507
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
510-
) -> Optional[TokenUpdateResponse]:
508+
) -> Optional[Token]:
511509
"""
512510
Update an existing token.
513511
@@ -557,9 +555,9 @@ async def update(
557555
extra_query=extra_query,
558556
extra_body=extra_body,
559557
timeout=timeout,
560-
post_parser=ResultWrapper[Optional[TokenUpdateResponse]]._unwrapper,
558+
post_parser=ResultWrapper[Optional[Token]]._unwrapper,
561559
),
562-
cast_to=cast(Type[Optional[TokenUpdateResponse]], ResultWrapper[TokenUpdateResponse]),
560+
cast_to=cast(Type[Optional[Token]], ResultWrapper[Token]),
563561
)
564562

565563
def list(
@@ -575,7 +573,7 @@ def list(
575573
extra_query: Query | None = None,
576574
extra_body: Body | None = None,
577575
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
578-
) -> AsyncPaginator[TokenListResponse, AsyncV4PagePaginationArray[TokenListResponse]]:
576+
) -> AsyncPaginator[Token, AsyncV4PagePaginationArray[Token]]:
579577
"""
580578
List all Account Owned API tokens created for this account.
581579
@@ -600,7 +598,7 @@ def list(
600598
raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
601599
return self._get_api_list(
602600
f"/accounts/{account_id}/tokens",
603-
page=AsyncV4PagePaginationArray[TokenListResponse],
601+
page=AsyncV4PagePaginationArray[Token],
604602
options=make_request_options(
605603
extra_headers=extra_headers,
606604
extra_query=extra_query,
@@ -615,7 +613,7 @@ def list(
615613
token_list_params.TokenListParams,
616614
),
617615
),
618-
model=TokenListResponse,
616+
model=Token,
619617
)
620618

621619
async def delete(
@@ -673,7 +671,7 @@ async def get(
673671
extra_query: Query | None = None,
674672
extra_body: Body | None = None,
675673
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
676-
) -> Optional[TokenGetResponse]:
674+
) -> Optional[Token]:
677675
"""
678676
Get information about a specific Account Owned API token.
679677
@@ -701,9 +699,9 @@ async def get(
701699
extra_query=extra_query,
702700
extra_body=extra_body,
703701
timeout=timeout,
704-
post_parser=ResultWrapper[Optional[TokenGetResponse]]._unwrapper,
702+
post_parser=ResultWrapper[Optional[Token]]._unwrapper,
705703
),
706-
cast_to=cast(Type[Optional[TokenGetResponse]], ResultWrapper[TokenGetResponse]),
704+
cast_to=cast(Type[Optional[Token]], ResultWrapper[Token]),
707705
)
708706

709707
async def verify(

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

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,10 @@
4141
PermissionGroupsResourceWithStreamingResponse,
4242
AsyncPermissionGroupsResourceWithStreamingResponse,
4343
)
44+
from ....types.user.token import Token
4445
from ....types.user.policy_param import PolicyParam
45-
from ....types.user.token_get_response import TokenGetResponse
46-
from ....types.user.token_list_response import TokenListResponse
4746
from ....types.user.token_create_response import TokenCreateResponse
4847
from ....types.user.token_delete_response import TokenDeleteResponse
49-
from ....types.user.token_update_response import TokenUpdateResponse
5048
from ....types.user.token_verify_response import TokenVerifyResponse
5149

5250
__all__ = ["TokensResource", "AsyncTokensResource"]
@@ -154,7 +152,7 @@ def update(
154152
extra_query: Query | None = None,
155153
extra_body: Body | None = None,
156154
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
157-
) -> Optional[TokenUpdateResponse]:
155+
) -> Optional[Token]:
158156
"""
159157
Update an existing token.
160158
@@ -200,9 +198,9 @@ def update(
200198
extra_query=extra_query,
201199
extra_body=extra_body,
202200
timeout=timeout,
203-
post_parser=ResultWrapper[Optional[TokenUpdateResponse]]._unwrapper,
201+
post_parser=ResultWrapper[Optional[Token]]._unwrapper,
204202
),
205-
cast_to=cast(Type[Optional[TokenUpdateResponse]], ResultWrapper[TokenUpdateResponse]),
203+
cast_to=cast(Type[Optional[Token]], ResultWrapper[Token]),
206204
)
207205

208206
def list(
@@ -217,7 +215,7 @@ def list(
217215
extra_query: Query | None = None,
218216
extra_body: Body | None = None,
219217
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
220-
) -> SyncV4PagePaginationArray[TokenListResponse]:
218+
) -> SyncV4PagePaginationArray[Token]:
221219
"""
222220
List all access tokens you created.
223221
@@ -238,7 +236,7 @@ def list(
238236
"""
239237
return self._get_api_list(
240238
"/user/tokens",
241-
page=SyncV4PagePaginationArray[TokenListResponse],
239+
page=SyncV4PagePaginationArray[Token],
242240
options=make_request_options(
243241
extra_headers=extra_headers,
244242
extra_query=extra_query,
@@ -253,7 +251,7 @@ def list(
253251
token_list_params.TokenListParams,
254252
),
255253
),
256-
model=TokenListResponse,
254+
model=Token,
257255
)
258256

259257
def delete(
@@ -305,7 +303,7 @@ def get(
305303
extra_query: Query | None = None,
306304
extra_body: Body | None = None,
307305
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
308-
) -> Optional[TokenGetResponse]:
306+
) -> Optional[Token]:
309307
"""
310308
Get information about a specific token.
311309
@@ -329,9 +327,9 @@ def get(
329327
extra_query=extra_query,
330328
extra_body=extra_body,
331329
timeout=timeout,
332-
post_parser=ResultWrapper[Optional[TokenGetResponse]]._unwrapper,
330+
post_parser=ResultWrapper[Optional[Token]]._unwrapper,
333331
),
334-
cast_to=cast(Type[Optional[TokenGetResponse]], ResultWrapper[TokenGetResponse]),
332+
cast_to=cast(Type[Optional[Token]], ResultWrapper[Token]),
335333
)
336334

337335
def verify(
@@ -460,7 +458,7 @@ async def update(
460458
extra_query: Query | None = None,
461459
extra_body: Body | None = None,
462460
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
463-
) -> Optional[TokenUpdateResponse]:
461+
) -> Optional[Token]:
464462
"""
465463
Update an existing token.
466464
@@ -506,9 +504,9 @@ async def update(
506504
extra_query=extra_query,
507505
extra_body=extra_body,
508506
timeout=timeout,
509-
post_parser=ResultWrapper[Optional[TokenUpdateResponse]]._unwrapper,
507+
post_parser=ResultWrapper[Optional[Token]]._unwrapper,
510508
),
511-
cast_to=cast(Type[Optional[TokenUpdateResponse]], ResultWrapper[TokenUpdateResponse]),
509+
cast_to=cast(Type[Optional[Token]], ResultWrapper[Token]),
512510
)
513511

514512
def list(
@@ -523,7 +521,7 @@ def list(
523521
extra_query: Query | None = None,
524522
extra_body: Body | None = None,
525523
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
526-
) -> AsyncPaginator[TokenListResponse, AsyncV4PagePaginationArray[TokenListResponse]]:
524+
) -> AsyncPaginator[Token, AsyncV4PagePaginationArray[Token]]:
527525
"""
528526
List all access tokens you created.
529527
@@ -544,7 +542,7 @@ def list(
544542
"""
545543
return self._get_api_list(
546544
"/user/tokens",
547-
page=AsyncV4PagePaginationArray[TokenListResponse],
545+
page=AsyncV4PagePaginationArray[Token],
548546
options=make_request_options(
549547
extra_headers=extra_headers,
550548
extra_query=extra_query,
@@ -559,7 +557,7 @@ def list(
559557
token_list_params.TokenListParams,
560558
),
561559
),
562-
model=TokenListResponse,
560+
model=Token,
563561
)
564562

565563
async def delete(
@@ -611,7 +609,7 @@ async def get(
611609
extra_query: Query | None = None,
612610
extra_body: Body | None = None,
613611
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
614-
) -> Optional[TokenGetResponse]:
612+
) -> Optional[Token]:
615613
"""
616614
Get information about a specific token.
617615
@@ -635,9 +633,9 @@ async def get(
635633
extra_query=extra_query,
636634
extra_body=extra_body,
637635
timeout=timeout,
638-
post_parser=ResultWrapper[Optional[TokenGetResponse]]._unwrapper,
636+
post_parser=ResultWrapper[Optional[Token]]._unwrapper,
639637
),
640-
cast_to=cast(Type[Optional[TokenGetResponse]], ResultWrapper[TokenGetResponse]),
638+
cast_to=cast(Type[Optional[Token]], ResultWrapper[Token]),
641639
)
642640

643641
async def verify(

‎src/cloudflare/types/accounts/__init__.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,15 @@
66
from .account import Account as Account
77
from .token_list_params import TokenListParams as TokenListParams
88
from .member_list_params import MemberListParams as MemberListParams
9-
from .token_get_response import TokenGetResponse as TokenGetResponse
109
from .account_list_params import AccountListParams as AccountListParams
1110
from .token_create_params import TokenCreateParams as TokenCreateParams
12-
from .token_list_response import TokenListResponse as TokenListResponse
1311
from .token_update_params import TokenUpdateParams as TokenUpdateParams
1412
from .member_create_params import MemberCreateParams as MemberCreateParams
1513
from .member_update_params import MemberUpdateParams as MemberUpdateParams
1614
from .account_create_params import AccountCreateParams as AccountCreateParams
1715
from .account_update_params import AccountUpdateParams as AccountUpdateParams
1816
from .token_create_response import TokenCreateResponse as TokenCreateResponse
1917
from .token_delete_response import TokenDeleteResponse as TokenDeleteResponse
20-
from .token_update_response import TokenUpdateResponse as TokenUpdateResponse
2118
from .token_verify_response import TokenVerifyResponse as TokenVerifyResponse
2219
from .member_delete_response import MemberDeleteResponse as MemberDeleteResponse
2320
from .account_delete_response import AccountDeleteResponse as AccountDeleteResponse

0 commit comments

Comments
 (0)