diff --git a/api.md b/api.md index 1dae49277f8..2d7c09ff439 100644 --- a/api.md +++ b/api.md @@ -2510,20 +2510,22 @@ Types: ```python from cloudflare.types.web3.hostnames.ipfs_universal_paths.content_lists import ( - ContentList, UnnamedSchemaRef5e618833803e286db9ee7c73727f8b86, + EntryCreateResponse, + EntryUpdateResponse, EntryListResponse, EntryDeleteResponse, + EntryGetResponse, ) ``` Methods: -- client.web3.hostnames.ipfs_universal_paths.content_lists.entries.create(identifier, \*, zone_identifier, \*\*params) -> ContentList -- client.web3.hostnames.ipfs_universal_paths.content_lists.entries.update(content_list_entry_identifier, \*, zone_identifier, identifier, \*\*params) -> ContentList +- client.web3.hostnames.ipfs_universal_paths.content_lists.entries.create(identifier, \*, zone_identifier, \*\*params) -> EntryCreateResponse +- client.web3.hostnames.ipfs_universal_paths.content_lists.entries.update(content_list_entry_identifier, \*, zone_identifier, identifier, \*\*params) -> EntryUpdateResponse - client.web3.hostnames.ipfs_universal_paths.content_lists.entries.list(identifier, \*, zone_identifier) -> Optional - client.web3.hostnames.ipfs_universal_paths.content_lists.entries.delete(content_list_entry_identifier, \*, zone_identifier, identifier, \*\*params) -> Optional -- client.web3.hostnames.ipfs_universal_paths.content_lists.entries.get(content_list_entry_identifier, \*, zone_identifier, identifier) -> ContentList +- client.web3.hostnames.ipfs_universal_paths.content_lists.entries.get(content_list_entry_identifier, \*, zone_identifier, identifier) -> EntryGetResponse # Workers @@ -2818,7 +2820,7 @@ Methods: - client.queues.create(\*, account_id, \*\*params) -> Optional - client.queues.update(queue_id, \*, account_id, \*\*params) -> Optional -- client.queues.list(\*, account_id) -> Optional +- client.queues.list(\*, account_id) -> SyncSinglePage[QueueListResponse] - client.queues.delete(queue_id, \*, account_id, \*\*params) -> Optional - client.queues.get(queue_id, \*, account_id) -> Optional @@ -5619,24 +5621,31 @@ Methods: Types: ```python -from cloudflare.types.zero_trust.gateway import Lists, ListCreateResponse +from cloudflare.types.zero_trust.gateway import ( + Lists, + ListCreateResponse, + ListUpdateResponse, + ListListResponse, + ListEditResponse, + ListGetResponse, +) ``` Methods: - client.zero_trust.gateway.lists.create(\*, account_id, \*\*params) -> ListCreateResponse -- client.zero_trust.gateway.lists.update(list_id, \*, account_id, \*\*params) -> Lists -- client.zero_trust.gateway.lists.list(\*, account_id) -> SyncSinglePage[Lists] +- client.zero_trust.gateway.lists.update(list_id, \*, account_id, \*\*params) -> ListUpdateResponse +- client.zero_trust.gateway.lists.list(\*, account_id) -> SyncSinglePage[ListListResponse] - client.zero_trust.gateway.lists.delete(list_id, \*, account_id, \*\*params) -> UnnamedSchemaRef9444735ca60712dbcf8afd832eb5716a -- client.zero_trust.gateway.lists.edit(list_id, \*, account_id, \*\*params) -> Lists -- client.zero_trust.gateway.lists.get(list_id, \*, account_id) -> Lists +- client.zero_trust.gateway.lists.edit(list_id, \*, account_id, \*\*params) -> ListEditResponse +- client.zero_trust.gateway.lists.get(list_id, \*, account_id) -> ListGetResponse #### Items Types: ```python -from cloudflare.types.zero_trust.gateway.lists import Lists, ItemListResponse +from cloudflare.types.zero_trust.gateway.lists import ItemListResponse ``` Methods: diff --git a/src/cloudflare/resources/queues/queues.py b/src/cloudflare/resources/queues/queues.py index 4cc9fd64ac5..f96cb24fdb8 100644 --- a/src/cloudflare/resources/queues/queues.py +++ b/src/cloudflare/resources/queues/queues.py @@ -46,7 +46,9 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper +from ...pagination import SyncSinglePage, AsyncSinglePage from ..._base_client import ( + AsyncPaginator, make_request_options, ) @@ -167,7 +169,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[QueueListResponse]: + ) -> SyncSinglePage[QueueListResponse]: """ Returns the queues owned by an account. @@ -184,16 +186,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}/queues", + page=SyncSinglePage[QueueListResponse], 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[QueueListResponse]], ResultWrapper[QueueListResponse]), + model=QueueListResponse, ) def delete( @@ -396,7 +395,7 @@ async def update( cast_to=cast(Type[Optional[QueueUpdateResponse]], ResultWrapper[QueueUpdateResponse]), ) - async def list( + def list( self, *, account_id: str, @@ -406,7 +405,7 @@ async def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[QueueListResponse]: + ) -> AsyncPaginator[QueueListResponse, AsyncSinglePage[QueueListResponse]]: """ Returns the queues owned by an account. @@ -423,16 +422,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}/queues", + page=AsyncSinglePage[QueueListResponse], 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[QueueListResponse]], ResultWrapper[QueueListResponse]), + model=QueueListResponse, ) async def delete( diff --git a/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/content_lists.py b/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/content_lists.py index b5ffc189018..86c69af5558 100644 --- a/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/content_lists.py +++ b/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/content_lists.py @@ -33,7 +33,6 @@ make_request_options, ) from ......types.web3.hostnames.ipfs_universal_paths import ContentList, content_list_update_params -from ......types.web3.hostnames.ipfs_universal_paths.content_lists import ContentListParam __all__ = ["ContentLists", "AsyncContentLists"] @@ -57,7 +56,7 @@ def update( *, zone_identifier: str, action: Literal["block"], - entries: Iterable[ContentListParam], + entries: Iterable[content_list_update_params.Entry], # 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, @@ -172,7 +171,7 @@ async def update( *, zone_identifier: str, action: Literal["block"], - entries: Iterable[ContentListParam], + entries: Iterable[content_list_update_params.Entry], # 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, diff --git a/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/entries.py b/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/entries.py index bf8ab01eef3..30e3d698d8e 100644 --- a/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/entries.py +++ b/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/entries.py @@ -25,9 +25,11 @@ make_request_options, ) from ......types.web3.hostnames.ipfs_universal_paths.content_lists import ( - ContentList, + EntryGetResponse, EntryListResponse, + EntryCreateResponse, EntryDeleteResponse, + EntryUpdateResponse, entry_create_params, entry_delete_params, entry_update_params, @@ -59,7 +61,7 @@ def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> ContentList: + ) -> EntryCreateResponse: """ Create IPFS Universal Path Gateway Content List Entry @@ -103,7 +105,7 @@ def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[ContentList], ResultWrapper[ContentList]), + cast_to=cast(Type[EntryCreateResponse], ResultWrapper[EntryCreateResponse]), ) def update( @@ -121,7 +123,7 @@ def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> ContentList: + ) -> EntryUpdateResponse: """ Edit IPFS Universal Path Gateway Content List Entry @@ -171,7 +173,7 @@ def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[ContentList], ResultWrapper[ContentList]), + cast_to=cast(Type[EntryUpdateResponse], ResultWrapper[EntryUpdateResponse]), ) def list( @@ -283,7 +285,7 @@ def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> ContentList: + ) -> EntryGetResponse: """ IPFS Universal Path Gateway Content List Entry Details @@ -319,7 +321,7 @@ def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[ContentList], ResultWrapper[ContentList]), + cast_to=cast(Type[EntryGetResponse], ResultWrapper[EntryGetResponse]), ) @@ -346,7 +348,7 @@ async def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> ContentList: + ) -> EntryCreateResponse: """ Create IPFS Universal Path Gateway Content List Entry @@ -390,7 +392,7 @@ async def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[ContentList], ResultWrapper[ContentList]), + cast_to=cast(Type[EntryCreateResponse], ResultWrapper[EntryCreateResponse]), ) async def update( @@ -408,7 +410,7 @@ async def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> ContentList: + ) -> EntryUpdateResponse: """ Edit IPFS Universal Path Gateway Content List Entry @@ -458,7 +460,7 @@ async def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[ContentList], ResultWrapper[ContentList]), + cast_to=cast(Type[EntryUpdateResponse], ResultWrapper[EntryUpdateResponse]), ) async def list( @@ -570,7 +572,7 @@ async def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> ContentList: + ) -> EntryGetResponse: """ IPFS Universal Path Gateway Content List Entry Details @@ -606,7 +608,7 @@ async def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[ContentList], ResultWrapper[ContentList]), + cast_to=cast(Type[EntryGetResponse], ResultWrapper[EntryGetResponse]), ) diff --git a/src/cloudflare/resources/zero_trust/gateway/lists/lists.py b/src/cloudflare/resources/zero_trust/gateway/lists/lists.py index e8fb6f5b36c..98e19fd4278 100644 --- a/src/cloudflare/resources/zero_trust/gateway/lists/lists.py +++ b/src/cloudflare/resources/zero_trust/gateway/lists/lists.py @@ -36,14 +36,17 @@ ) from .....types.shared import UnnamedSchemaRef9444735ca60712dbcf8afd832eb5716a from .....types.zero_trust.gateway import ( + ListsParam, + ListGetResponse, + ListEditResponse, + ListListResponse, ListCreateResponse, - lists, + ListUpdateResponse, list_edit_params, list_create_params, list_delete_params, list_update_params, ) -from .....types.zero_trust.gateway.lists import ListsParam __all__ = ["Lists", "AsyncLists"] @@ -132,7 +135,7 @@ def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> lists.Lists: + ) -> ListUpdateResponse: """ Updates a configured Zero Trust list. @@ -171,7 +174,7 @@ def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[lists.Lists], ResultWrapper[lists.Lists]), + cast_to=cast(Type[ListUpdateResponse], ResultWrapper[ListUpdateResponse]), ) def list( @@ -184,7 +187,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> SyncSinglePage[lists.Lists]: + ) -> SyncSinglePage[ListListResponse]: """ Fetches all Zero Trust lists for an account. @@ -201,11 +204,11 @@ 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}/gateway/lists", - page=SyncSinglePage[lists.Lists], + page=SyncSinglePage[ListListResponse], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=lists.Lists, + model=ListListResponse, ) def delete( @@ -270,7 +273,7 @@ def edit( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> lists.Lists: + ) -> ListEditResponse: """ Appends or removes an item from a configured Zero Trust list. @@ -309,7 +312,7 @@ def edit( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[lists.Lists], ResultWrapper[lists.Lists]), + cast_to=cast(Type[ListEditResponse], ResultWrapper[ListEditResponse]), ) def get( @@ -323,7 +326,7 @@ def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> lists.Lists: + ) -> ListGetResponse: """ Fetches a single Zero Trust list. @@ -351,7 +354,7 @@ def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[lists.Lists], ResultWrapper[lists.Lists]), + cast_to=cast(Type[ListGetResponse], ResultWrapper[ListGetResponse]), ) @@ -439,7 +442,7 @@ async def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> lists.Lists: + ) -> ListUpdateResponse: """ Updates a configured Zero Trust list. @@ -478,7 +481,7 @@ async def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[lists.Lists], ResultWrapper[lists.Lists]), + cast_to=cast(Type[ListUpdateResponse], ResultWrapper[ListUpdateResponse]), ) def list( @@ -491,7 +494,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> AsyncPaginator[lists.Lists, AsyncSinglePage[lists.Lists]]: + ) -> AsyncPaginator[ListListResponse, AsyncSinglePage[ListListResponse]]: """ Fetches all Zero Trust lists for an account. @@ -508,11 +511,11 @@ 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}/gateway/lists", - page=AsyncSinglePage[lists.Lists], + page=AsyncSinglePage[ListListResponse], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=lists.Lists, + model=ListListResponse, ) async def delete( @@ -577,7 +580,7 @@ async def edit( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> lists.Lists: + ) -> ListEditResponse: """ Appends or removes an item from a configured Zero Trust list. @@ -616,7 +619,7 @@ async def edit( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[lists.Lists], ResultWrapper[lists.Lists]), + cast_to=cast(Type[ListEditResponse], ResultWrapper[ListEditResponse]), ) async def get( @@ -630,7 +633,7 @@ async def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> lists.Lists: + ) -> ListGetResponse: """ Fetches a single Zero Trust list. @@ -658,7 +661,7 @@ async def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[lists.Lists], ResultWrapper[lists.Lists]), + cast_to=cast(Type[ListGetResponse], ResultWrapper[ListGetResponse]), ) diff --git a/src/cloudflare/types/queue_list_response.py b/src/cloudflare/types/queue_list_response.py index 9b0038b8c4d..1ccfe1e6e71 100644 --- a/src/cloudflare/types/queue_list_response.py +++ b/src/cloudflare/types/queue_list_response.py @@ -1,13 +1,13 @@ # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. -from typing import List, Optional +from typing import Optional from .._models import BaseModel -__all__ = ["QueueListResponse", "QueueListResponseItem"] +__all__ = ["QueueListResponse"] -class QueueListResponseItem(BaseModel): +class QueueListResponse(BaseModel): consumers: Optional[object] = None consumers_total_count: Optional[object] = None @@ -23,6 +23,3 @@ class QueueListResponseItem(BaseModel): queue_id: Optional[str] = None queue_name: Optional[str] = None - - -QueueListResponse = List[QueueListResponseItem] diff --git a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/__init__.py b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/__init__.py index e50100454ca..c97af8e9619 100644 --- a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/__init__.py +++ b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/__init__.py @@ -3,5 +3,4 @@ from __future__ import annotations from .content_list import ContentList as ContentList -from .content_list_param import ContentListParam as ContentListParam from .content_list_update_params import ContentListUpdateParams as ContentListUpdateParams diff --git a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_list_param.py b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_list_param.py deleted file mode 100644 index 83f1222c862..00000000000 --- a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_list_param.py +++ /dev/null @@ -1,12 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from __future__ import annotations - -from typing_extensions import Literal, TypedDict - -__all__ = ["ContentListParam"] - - -class ContentListParam(TypedDict, total=False): - action: Literal["block"] - """Behavior of the content list.""" diff --git a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_list_update_params.py b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_list_update_params.py index 2a8eeb8db64..a7758805219 100644 --- a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_list_update_params.py +++ b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_list_update_params.py @@ -5,9 +5,7 @@ from typing import Iterable from typing_extensions import Literal, Required, TypedDict -from .content_lists import ContentListParam - -__all__ = ["ContentListUpdateParams"] +__all__ = ["ContentListUpdateParams", "Entry"] class ContentListUpdateParams(TypedDict, total=False): @@ -17,5 +15,16 @@ class ContentListUpdateParams(TypedDict, total=False): action: Required[Literal["block"]] """Behavior of the content list.""" - entries: Required[Iterable[ContentListParam]] + entries: Required[Iterable[Entry]] """Content list entries.""" + + +class Entry(TypedDict, total=False): + content: str + """CID or content path of content to block.""" + + description: str + """An optional description of the content list entry.""" + + type: Literal["cid", "content_path"] + """Type of content list entry to block.""" diff --git a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/__init__.py b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/__init__.py index 4cdadf60ae7..e28878b6b70 100644 --- a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/__init__.py +++ b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/__init__.py @@ -2,10 +2,11 @@ from __future__ import annotations -from .content_list import ContentList as ContentList -from .content_list_param import ContentListParam as ContentListParam +from .entry_get_response import EntryGetResponse as EntryGetResponse from .entry_create_params import EntryCreateParams as EntryCreateParams from .entry_delete_params import EntryDeleteParams as EntryDeleteParams from .entry_list_response import EntryListResponse as EntryListResponse from .entry_update_params import EntryUpdateParams as EntryUpdateParams +from .entry_create_response import EntryCreateResponse as EntryCreateResponse from .entry_delete_response import EntryDeleteResponse as EntryDeleteResponse +from .entry_update_response import EntryUpdateResponse as EntryUpdateResponse diff --git a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/content_list_param.py b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/content_list_param.py deleted file mode 100644 index f22f8f3ee13..00000000000 --- a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/content_list_param.py +++ /dev/null @@ -1,18 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from __future__ import annotations - -from typing_extensions import Literal, TypedDict - -__all__ = ["ContentListParam"] - - -class ContentListParam(TypedDict, total=False): - content: str - """CID or content path of content to block.""" - - description: str - """An optional description of the content list entry.""" - - type: Literal["cid", "content_path"] - """Type of content list entry to block.""" diff --git a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_create_response.py b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_create_response.py new file mode 100644 index 00000000000..429847809f0 --- /dev/null +++ b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_create_response.py @@ -0,0 +1,27 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import Optional +from datetime import datetime +from typing_extensions import Literal + +from ......_models import BaseModel + +__all__ = ["EntryCreateResponse"] + + +class EntryCreateResponse(BaseModel): + id: Optional[str] = None + """Identifier""" + + content: Optional[str] = None + """CID or content path of content to block.""" + + created_on: Optional[datetime] = None + + description: Optional[str] = None + """An optional description of the content list entry.""" + + modified_on: Optional[datetime] = None + + type: Optional[Literal["cid", "content_path"]] = None + """Type of content list entry to block.""" diff --git a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/content_list.py b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_get_response.py similarity index 90% rename from src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/content_list.py rename to src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_get_response.py index 94dffe4d9f6..90c70bb7c57 100644 --- a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/content_list.py +++ b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_get_response.py @@ -6,10 +6,10 @@ from ......_models import BaseModel -__all__ = ["ContentList"] +__all__ = ["EntryGetResponse"] -class ContentList(BaseModel): +class EntryGetResponse(BaseModel): id: Optional[str] = None """Identifier""" diff --git a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_list_response.py b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_list_response.py index c8d62e8149a..b1de50eaf73 100644 --- a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_list_response.py +++ b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_list_response.py @@ -1,13 +1,32 @@ # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. from typing import List, Optional +from datetime import datetime +from typing_extensions import Literal from ......_models import BaseModel -from .content_list import ContentList -__all__ = ["EntryListResponse"] +__all__ = ["EntryListResponse", "Entry"] + + +class Entry(BaseModel): + id: Optional[str] = None + """Identifier""" + + content: Optional[str] = None + """CID or content path of content to block.""" + + created_on: Optional[datetime] = None + + description: Optional[str] = None + """An optional description of the content list entry.""" + + modified_on: Optional[datetime] = None + + type: Optional[Literal["cid", "content_path"]] = None + """Type of content list entry to block.""" class EntryListResponse(BaseModel): - entries: Optional[List[ContentList]] = None + entries: Optional[List[Entry]] = None """Content list entries.""" diff --git a/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_update_response.py b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_update_response.py new file mode 100644 index 00000000000..e61fc00ffee --- /dev/null +++ b/src/cloudflare/types/web3/hostnames/ipfs_universal_paths/content_lists/entry_update_response.py @@ -0,0 +1,27 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import Optional +from datetime import datetime +from typing_extensions import Literal + +from ......_models import BaseModel + +__all__ = ["EntryUpdateResponse"] + + +class EntryUpdateResponse(BaseModel): + id: Optional[str] = None + """Identifier""" + + content: Optional[str] = None + """CID or content path of content to block.""" + + created_on: Optional[datetime] = None + + description: Optional[str] = None + """An optional description of the content list entry.""" + + modified_on: Optional[datetime] = None + + type: Optional[Literal["cid", "content_path"]] = None + """Type of content list entry to block.""" diff --git a/src/cloudflare/types/zero_trust/gateway/__init__.py b/src/cloudflare/types/zero_trust/gateway/__init__.py index 8d12771dc62..99388c4cccc 100644 --- a/src/cloudflare/types/zero_trust/gateway/__init__.py +++ b/src/cloudflare/types/zero_trust/gateway/__init__.py @@ -20,8 +20,11 @@ from .gateway_settings import GatewaySettings as GatewaySettings from .list_edit_params import ListEditParams as ListEditParams from .location_network import LocationNetwork as LocationNetwork +from .list_get_response import ListGetResponse as ListGetResponse from .list_create_params import ListCreateParams as ListCreateParams from .list_delete_params import ListDeleteParams as ListDeleteParams +from .list_edit_response import ListEditResponse as ListEditResponse +from .list_list_response import ListListResponse as ListListResponse from .list_update_params import ListUpdateParams as ListUpdateParams from .protocol_detection import ProtocolDetection as ProtocolDetection from .rule_create_params import RuleCreateParams as RuleCreateParams @@ -33,6 +36,7 @@ from .block_page_settings import BlockPageSettings as BlockPageSettings from .fips_settings_param import FipsSettingsParam as FipsSettingsParam from .list_create_response import ListCreateResponse as ListCreateResponse +from .list_update_response import ListUpdateResponse as ListUpdateResponse from .activity_log_settings import ActivityLogSettings as ActivityLogSettings from .logging_update_params import LoggingUpdateParams as LoggingUpdateParams from .notification_settings import NotificationSettings as NotificationSettings diff --git a/src/cloudflare/types/zero_trust/gateway/list_create_params.py b/src/cloudflare/types/zero_trust/gateway/list_create_params.py index fe48a509727..48fcc1314fd 100644 --- a/src/cloudflare/types/zero_trust/gateway/list_create_params.py +++ b/src/cloudflare/types/zero_trust/gateway/list_create_params.py @@ -5,7 +5,7 @@ from typing import Iterable from typing_extensions import Literal, Required, TypedDict -from .lists import ListsParam +from .lists_param import ListsParam __all__ = ["ListCreateParams"] diff --git a/src/cloudflare/types/zero_trust/gateway/list_edit_params.py b/src/cloudflare/types/zero_trust/gateway/list_edit_params.py index 503c12eba55..3c7b279389d 100644 --- a/src/cloudflare/types/zero_trust/gateway/list_edit_params.py +++ b/src/cloudflare/types/zero_trust/gateway/list_edit_params.py @@ -5,7 +5,7 @@ from typing import List, Iterable from typing_extensions import Required, TypedDict -from .lists import ListsParam +from .lists_param import ListsParam __all__ = ["ListEditParams"] diff --git a/src/cloudflare/types/zero_trust/gateway/list_edit_response.py b/src/cloudflare/types/zero_trust/gateway/list_edit_response.py new file mode 100644 index 00000000000..c0910e68561 --- /dev/null +++ b/src/cloudflare/types/zero_trust/gateway/list_edit_response.py @@ -0,0 +1,30 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import Optional +from datetime import datetime +from typing_extensions import Literal + +from ...._models import BaseModel + +__all__ = ["ListEditResponse"] + + +class ListEditResponse(BaseModel): + id: Optional[str] = None + """API Resource UUID tag.""" + + count: Optional[float] = None + """The number of items in the list.""" + + created_at: Optional[datetime] = None + + description: Optional[str] = None + """The description of the list.""" + + name: Optional[str] = None + """The name of the list.""" + + type: Optional[Literal["SERIAL", "URL", "DOMAIN", "EMAIL", "IP"]] = None + """The type of list.""" + + updated_at: Optional[datetime] = None diff --git a/src/cloudflare/types/zero_trust/gateway/list_get_response.py b/src/cloudflare/types/zero_trust/gateway/list_get_response.py new file mode 100644 index 00000000000..218845d820e --- /dev/null +++ b/src/cloudflare/types/zero_trust/gateway/list_get_response.py @@ -0,0 +1,30 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import Optional +from datetime import datetime +from typing_extensions import Literal + +from ...._models import BaseModel + +__all__ = ["ListGetResponse"] + + +class ListGetResponse(BaseModel): + id: Optional[str] = None + """API Resource UUID tag.""" + + count: Optional[float] = None + """The number of items in the list.""" + + created_at: Optional[datetime] = None + + description: Optional[str] = None + """The description of the list.""" + + name: Optional[str] = None + """The name of the list.""" + + type: Optional[Literal["SERIAL", "URL", "DOMAIN", "EMAIL", "IP"]] = None + """The type of list.""" + + updated_at: Optional[datetime] = None diff --git a/src/cloudflare/types/zero_trust/gateway/list_list_response.py b/src/cloudflare/types/zero_trust/gateway/list_list_response.py new file mode 100644 index 00000000000..fe21d862d2e --- /dev/null +++ b/src/cloudflare/types/zero_trust/gateway/list_list_response.py @@ -0,0 +1,30 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import Optional +from datetime import datetime +from typing_extensions import Literal + +from ...._models import BaseModel + +__all__ = ["ListListResponse"] + + +class ListListResponse(BaseModel): + id: Optional[str] = None + """API Resource UUID tag.""" + + count: Optional[float] = None + """The number of items in the list.""" + + created_at: Optional[datetime] = None + + description: Optional[str] = None + """The description of the list.""" + + name: Optional[str] = None + """The name of the list.""" + + type: Optional[Literal["SERIAL", "URL", "DOMAIN", "EMAIL", "IP"]] = None + """The type of list.""" + + updated_at: Optional[datetime] = None diff --git a/src/cloudflare/types/zero_trust/gateway/list_update_response.py b/src/cloudflare/types/zero_trust/gateway/list_update_response.py new file mode 100644 index 00000000000..f991c0cd4a5 --- /dev/null +++ b/src/cloudflare/types/zero_trust/gateway/list_update_response.py @@ -0,0 +1,30 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import Optional +from datetime import datetime +from typing_extensions import Literal + +from ...._models import BaseModel + +__all__ = ["ListUpdateResponse"] + + +class ListUpdateResponse(BaseModel): + id: Optional[str] = None + """API Resource UUID tag.""" + + count: Optional[float] = None + """The number of items in the list.""" + + created_at: Optional[datetime] = None + + description: Optional[str] = None + """The description of the list.""" + + name: Optional[str] = None + """The name of the list.""" + + type: Optional[Literal["SERIAL", "URL", "DOMAIN", "EMAIL", "IP"]] = None + """The type of list.""" + + updated_at: Optional[datetime] = None diff --git a/src/cloudflare/types/zero_trust/gateway/lists/__init__.py b/src/cloudflare/types/zero_trust/gateway/lists/__init__.py index 4c4a22bf733..ed652e67720 100644 --- a/src/cloudflare/types/zero_trust/gateway/lists/__init__.py +++ b/src/cloudflare/types/zero_trust/gateway/lists/__init__.py @@ -3,5 +3,4 @@ from __future__ import annotations from .lists import Lists as Lists -from .lists_param import ListsParam as ListsParam from .item_list_response import ItemListResponse as ItemListResponse diff --git a/src/cloudflare/types/zero_trust/gateway/lists/item_list_response.py b/src/cloudflare/types/zero_trust/gateway/lists/item_list_response.py index da1e753659c..55983b63dad 100644 --- a/src/cloudflare/types/zero_trust/gateway/lists/item_list_response.py +++ b/src/cloudflare/types/zero_trust/gateway/lists/item_list_response.py @@ -2,7 +2,7 @@ from typing import List -from .lists import Lists +from cloudflare.types.zero_trust.gateway import Lists __all__ = ["ItemListResponse"] diff --git a/src/cloudflare/types/zero_trust/gateway/lists/lists_param.py b/src/cloudflare/types/zero_trust/gateway/lists/lists_param.py deleted file mode 100644 index 5b31db9adf0..00000000000 --- a/src/cloudflare/types/zero_trust/gateway/lists/lists_param.py +++ /dev/null @@ -1,12 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from __future__ import annotations - -from typing_extensions import TypedDict - -__all__ = ["ListsParam"] - - -class ListsParam(TypedDict, total=False): - value: str - """The value of the item in a list.""" diff --git a/tests/api_resources/test_queues.py b/tests/api_resources/test_queues.py index 09a971a7f1c..4040aa3ca7e 100644 --- a/tests/api_resources/test_queues.py +++ b/tests/api_resources/test_queues.py @@ -16,6 +16,7 @@ QueueDeleteResponse, QueueUpdateResponse, ) +from cloudflare.pagination import SyncSinglePage, AsyncSinglePage base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -132,7 +133,7 @@ def test_method_list(self, client: Cloudflare) -> None: queue = client.queues.list( account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(Optional[QueueListResponse], queue, path=["response"]) + assert_matches_type(SyncSinglePage[QueueListResponse], queue, path=["response"]) @pytest.mark.skip() @parametrize @@ -144,7 +145,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" queue = response.parse() - assert_matches_type(Optional[QueueListResponse], queue, path=["response"]) + assert_matches_type(SyncSinglePage[QueueListResponse], queue, path=["response"]) @pytest.mark.skip() @parametrize @@ -156,7 +157,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" queue = response.parse() - assert_matches_type(Optional[QueueListResponse], queue, path=["response"]) + assert_matches_type(SyncSinglePage[QueueListResponse], queue, path=["response"]) assert cast(Any, response.is_closed) is True @@ -390,7 +391,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None: queue = await async_client.queues.list( account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(Optional[QueueListResponse], queue, path=["response"]) + assert_matches_type(AsyncSinglePage[QueueListResponse], queue, path=["response"]) @pytest.mark.skip() @parametrize @@ -402,7 +403,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" queue = await response.parse() - assert_matches_type(Optional[QueueListResponse], queue, path=["response"]) + assert_matches_type(AsyncSinglePage[QueueListResponse], queue, path=["response"]) @pytest.mark.skip() @parametrize @@ -414,7 +415,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" queue = await response.parse() - assert_matches_type(Optional[QueueListResponse], queue, path=["response"]) + assert_matches_type(AsyncSinglePage[QueueListResponse], queue, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/web3/hostnames/ipfs_universal_paths/content_lists/test_entries.py b/tests/api_resources/web3/hostnames/ipfs_universal_paths/content_lists/test_entries.py index 80096cfb912..a908abdd86d 100644 --- a/tests/api_resources/web3/hostnames/ipfs_universal_paths/content_lists/test_entries.py +++ b/tests/api_resources/web3/hostnames/ipfs_universal_paths/content_lists/test_entries.py @@ -10,9 +10,11 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.types.web3.hostnames.ipfs_universal_paths.content_lists import ( - ContentList, + EntryGetResponse, EntryListResponse, + EntryCreateResponse, EntryDeleteResponse, + EntryUpdateResponse, ) base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -30,7 +32,7 @@ def test_method_create(self, client: Cloudflare) -> None: content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB", type="cid", ) - assert_matches_type(ContentList, entry, path=["response"]) + assert_matches_type(EntryCreateResponse, entry, path=["response"]) @pytest.mark.skip() @parametrize @@ -42,7 +44,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None: type="cid", description="this is my content list entry", ) - assert_matches_type(ContentList, entry, path=["response"]) + assert_matches_type(EntryCreateResponse, entry, path=["response"]) @pytest.mark.skip() @parametrize @@ -57,7 +59,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" entry = response.parse() - assert_matches_type(ContentList, entry, path=["response"]) + assert_matches_type(EntryCreateResponse, entry, path=["response"]) @pytest.mark.skip() @parametrize @@ -72,7 +74,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" entry = response.parse() - assert_matches_type(ContentList, entry, path=["response"]) + assert_matches_type(EntryCreateResponse, entry, path=["response"]) assert cast(Any, response.is_closed) is True @@ -105,7 +107,7 @@ def test_method_update(self, client: Cloudflare) -> None: content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB", type="cid", ) - assert_matches_type(ContentList, entry, path=["response"]) + assert_matches_type(EntryUpdateResponse, entry, path=["response"]) @pytest.mark.skip() @parametrize @@ -118,7 +120,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None: type="cid", description="this is my content list entry", ) - assert_matches_type(ContentList, entry, path=["response"]) + assert_matches_type(EntryUpdateResponse, entry, path=["response"]) @pytest.mark.skip() @parametrize @@ -134,7 +136,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" entry = response.parse() - assert_matches_type(ContentList, entry, path=["response"]) + assert_matches_type(EntryUpdateResponse, entry, path=["response"]) @pytest.mark.skip() @parametrize @@ -150,7 +152,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" entry = response.parse() - assert_matches_type(ContentList, entry, path=["response"]) + assert_matches_type(EntryUpdateResponse, entry, path=["response"]) assert cast(Any, response.is_closed) is True @@ -318,7 +320,7 @@ def test_method_get(self, client: Cloudflare) -> None: zone_identifier="023e105f4ecef8ad9ca31a8372d0c353", identifier="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(ContentList, entry, path=["response"]) + assert_matches_type(EntryGetResponse, entry, path=["response"]) @pytest.mark.skip() @parametrize @@ -332,7 +334,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" entry = response.parse() - assert_matches_type(ContentList, entry, path=["response"]) + assert_matches_type(EntryGetResponse, entry, path=["response"]) @pytest.mark.skip() @parametrize @@ -346,7 +348,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" entry = response.parse() - assert_matches_type(ContentList, entry, path=["response"]) + assert_matches_type(EntryGetResponse, entry, path=["response"]) assert cast(Any, response.is_closed) is True @@ -389,7 +391,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None: content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB", type="cid", ) - assert_matches_type(ContentList, entry, path=["response"]) + assert_matches_type(EntryCreateResponse, entry, path=["response"]) @pytest.mark.skip() @parametrize @@ -401,7 +403,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare type="cid", description="this is my content list entry", ) - assert_matches_type(ContentList, entry, path=["response"]) + assert_matches_type(EntryCreateResponse, entry, path=["response"]) @pytest.mark.skip() @parametrize @@ -418,7 +420,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" entry = await response.parse() - assert_matches_type(ContentList, entry, path=["response"]) + assert_matches_type(EntryCreateResponse, entry, path=["response"]) @pytest.mark.skip() @parametrize @@ -433,7 +435,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" entry = await response.parse() - assert_matches_type(ContentList, entry, path=["response"]) + assert_matches_type(EntryCreateResponse, entry, path=["response"]) assert cast(Any, response.is_closed) is True @@ -466,7 +468,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None: content="QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB", type="cid", ) - assert_matches_type(ContentList, entry, path=["response"]) + assert_matches_type(EntryUpdateResponse, entry, path=["response"]) @pytest.mark.skip() @parametrize @@ -479,7 +481,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare type="cid", description="this is my content list entry", ) - assert_matches_type(ContentList, entry, path=["response"]) + assert_matches_type(EntryUpdateResponse, entry, path=["response"]) @pytest.mark.skip() @parametrize @@ -497,7 +499,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" entry = await response.parse() - assert_matches_type(ContentList, entry, path=["response"]) + assert_matches_type(EntryUpdateResponse, entry, path=["response"]) @pytest.mark.skip() @parametrize @@ -513,7 +515,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" entry = await response.parse() - assert_matches_type(ContentList, entry, path=["response"]) + assert_matches_type(EntryUpdateResponse, entry, path=["response"]) assert cast(Any, response.is_closed) is True @@ -683,7 +685,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None: zone_identifier="023e105f4ecef8ad9ca31a8372d0c353", identifier="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(ContentList, entry, path=["response"]) + assert_matches_type(EntryGetResponse, entry, path=["response"]) @pytest.mark.skip() @parametrize @@ -697,7 +699,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" entry = await response.parse() - assert_matches_type(ContentList, entry, path=["response"]) + assert_matches_type(EntryGetResponse, entry, path=["response"]) @pytest.mark.skip() @parametrize @@ -711,7 +713,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No assert response.http_request.headers.get("X-Stainless-Lang") == "python" entry = await response.parse() - assert_matches_type(ContentList, entry, path=["response"]) + assert_matches_type(EntryGetResponse, entry, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/zero_trust/gateway/test_lists.py b/tests/api_resources/zero_trust/gateway/test_lists.py index ef5bda156b0..14035f4a55c 100644 --- a/tests/api_resources/zero_trust/gateway/test_lists.py +++ b/tests/api_resources/zero_trust/gateway/test_lists.py @@ -12,8 +12,11 @@ from cloudflare.pagination import SyncSinglePage, AsyncSinglePage from cloudflare.types.shared import UnnamedSchemaRef9444735ca60712dbcf8afd832eb5716a from cloudflare.types.zero_trust.gateway import ( - Lists, + ListGetResponse, + ListEditResponse, + ListListResponse, ListCreateResponse, + ListUpdateResponse, ) base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -92,7 +95,7 @@ def test_method_update(self, client: Cloudflare) -> None: account_id="699d98642c564d2e855e9661899b7252", name="Admin Serial Numbers", ) - assert_matches_type(Lists, list, path=["response"]) + assert_matches_type(ListUpdateResponse, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -103,7 +106,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None: name="Admin Serial Numbers", description="The serial numbers for administrators", ) - assert_matches_type(Lists, list, path=["response"]) + assert_matches_type(ListUpdateResponse, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -117,7 +120,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = response.parse() - assert_matches_type(Lists, list, path=["response"]) + assert_matches_type(ListUpdateResponse, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -131,7 +134,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = response.parse() - assert_matches_type(Lists, list, path=["response"]) + assert_matches_type(ListUpdateResponse, list, path=["response"]) assert cast(Any, response.is_closed) is True @@ -158,7 +161,7 @@ def test_method_list(self, client: Cloudflare) -> None: list = client.zero_trust.gateway.lists.list( account_id="699d98642c564d2e855e9661899b7252", ) - assert_matches_type(SyncSinglePage[Lists], list, path=["response"]) + assert_matches_type(SyncSinglePage[ListListResponse], list, path=["response"]) @pytest.mark.skip() @parametrize @@ -170,7 +173,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = response.parse() - assert_matches_type(SyncSinglePage[Lists], list, path=["response"]) + assert_matches_type(SyncSinglePage[ListListResponse], list, path=["response"]) @pytest.mark.skip() @parametrize @@ -182,7 +185,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = response.parse() - assert_matches_type(SyncSinglePage[Lists], list, path=["response"]) + assert_matches_type(SyncSinglePage[ListListResponse], list, path=["response"]) assert cast(Any, response.is_closed) is True @@ -258,7 +261,7 @@ def test_method_edit(self, client: Cloudflare) -> None: "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", account_id="699d98642c564d2e855e9661899b7252", ) - assert_matches_type(Lists, list, path=["response"]) + assert_matches_type(ListEditResponse, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -269,7 +272,7 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None: append=[{"value": "8GE8721REF"}, {"value": "8GE8721REF"}, {"value": "8GE8721REF"}], remove=["8GE8721REF", "8GE8721REF", "8GE8721REF"], ) - assert_matches_type(Lists, list, path=["response"]) + assert_matches_type(ListEditResponse, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -282,7 +285,7 @@ def test_raw_response_edit(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = response.parse() - assert_matches_type(Lists, list, path=["response"]) + assert_matches_type(ListEditResponse, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -295,7 +298,7 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = response.parse() - assert_matches_type(Lists, list, path=["response"]) + assert_matches_type(ListEditResponse, list, path=["response"]) assert cast(Any, response.is_closed) is True @@ -321,7 +324,7 @@ def test_method_get(self, client: Cloudflare) -> None: "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", account_id="699d98642c564d2e855e9661899b7252", ) - assert_matches_type(Lists, list, path=["response"]) + assert_matches_type(ListGetResponse, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -334,7 +337,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = response.parse() - assert_matches_type(Lists, list, path=["response"]) + assert_matches_type(ListGetResponse, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -347,7 +350,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = response.parse() - assert_matches_type(Lists, list, path=["response"]) + assert_matches_type(ListGetResponse, list, path=["response"]) assert cast(Any, response.is_closed) is True @@ -440,7 +443,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None: account_id="699d98642c564d2e855e9661899b7252", name="Admin Serial Numbers", ) - assert_matches_type(Lists, list, path=["response"]) + assert_matches_type(ListUpdateResponse, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -451,7 +454,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare name="Admin Serial Numbers", description="The serial numbers for administrators", ) - assert_matches_type(Lists, list, path=["response"]) + assert_matches_type(ListUpdateResponse, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -465,7 +468,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = await response.parse() - assert_matches_type(Lists, list, path=["response"]) + assert_matches_type(ListUpdateResponse, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -479,7 +482,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = await response.parse() - assert_matches_type(Lists, list, path=["response"]) + assert_matches_type(ListUpdateResponse, list, path=["response"]) assert cast(Any, response.is_closed) is True @@ -506,7 +509,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None: list = await async_client.zero_trust.gateway.lists.list( account_id="699d98642c564d2e855e9661899b7252", ) - assert_matches_type(AsyncSinglePage[Lists], list, path=["response"]) + assert_matches_type(AsyncSinglePage[ListListResponse], list, path=["response"]) @pytest.mark.skip() @parametrize @@ -518,7 +521,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = await response.parse() - assert_matches_type(AsyncSinglePage[Lists], list, path=["response"]) + assert_matches_type(AsyncSinglePage[ListListResponse], list, path=["response"]) @pytest.mark.skip() @parametrize @@ -530,7 +533,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = await response.parse() - assert_matches_type(AsyncSinglePage[Lists], list, path=["response"]) + assert_matches_type(AsyncSinglePage[ListListResponse], list, path=["response"]) assert cast(Any, response.is_closed) is True @@ -606,7 +609,7 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None: "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", account_id="699d98642c564d2e855e9661899b7252", ) - assert_matches_type(Lists, list, path=["response"]) + assert_matches_type(ListEditResponse, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -617,7 +620,7 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) append=[{"value": "8GE8721REF"}, {"value": "8GE8721REF"}, {"value": "8GE8721REF"}], remove=["8GE8721REF", "8GE8721REF", "8GE8721REF"], ) - assert_matches_type(Lists, list, path=["response"]) + assert_matches_type(ListEditResponse, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -630,7 +633,7 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = await response.parse() - assert_matches_type(Lists, list, path=["response"]) + assert_matches_type(ListEditResponse, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -643,7 +646,7 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = await response.parse() - assert_matches_type(Lists, list, path=["response"]) + assert_matches_type(ListEditResponse, list, path=["response"]) assert cast(Any, response.is_closed) is True @@ -669,7 +672,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None: "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", account_id="699d98642c564d2e855e9661899b7252", ) - assert_matches_type(Lists, list, path=["response"]) + assert_matches_type(ListGetResponse, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -682,7 +685,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = await response.parse() - assert_matches_type(Lists, list, path=["response"]) + assert_matches_type(ListGetResponse, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -695,7 +698,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = await response.parse() - assert_matches_type(Lists, list, path=["response"]) + assert_matches_type(ListGetResponse, list, path=["response"]) assert cast(Any, response.is_closed) is True