From d0662057bb4061f2a1b3ee02d2dba4715dec351f Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 10:25:16 +0000 Subject: [PATCH] feat(api): update via SDK Studio (#268) --- api.md | 117 +++++++----------- .../resources/addressing/prefixes/prefixes.py | 41 +++--- src/cloudflare/resources/logpush/jobs.py | 49 +++++--- .../hostnames/certificates.py | 32 +++-- .../resources/secondary_dns/__init__.py | 48 +++---- .../resources/secondary_dns/incoming.py | 38 +++--- .../secondary_dns/outgoing/__init__.py | 24 ++-- .../secondary_dns/outgoing/outgoing.py | 38 +++--- .../resources/secondary_dns/peers.py | 47 ++++--- .../resources/secondary_dns/secondary_dns.py | 74 +++++------ src/cloudflare/types/__init__.py | 24 +--- src/cloudflare/types/addressing/__init__.py | 5 +- .../addressing/prefix_create_response.py | 59 +++++++++ .../types/addressing/prefix_edit_response.py | 59 +++++++++ .../{prefix.py => prefix_get_response.py} | 4 +- .../types/addressing/prefix_list_response.py | 59 +++++++++ .../types/firewall/waf/packages/__init__.py | 4 +- .../waf/packages/rule_edit_response.py | 8 +- .../waf/packages/rule_list_response.py | 8 +- ...2dd36bae8acddebf5.py => waf_rule_group.py} | 4 +- src/cloudflare/types/info.py | 27 ++-- src/cloudflare/types/logpush/__init__.py | 6 + .../types/logpush/datasets/__init__.py | 3 - .../logpush/datasets/job_get_response.py | 82 +++++++++++- .../types/logpush/job_create_params.py | 2 +- .../types/logpush/job_create_response.py | 82 ++++++++++++ .../{datasets/job.py => job_get_response.py} | 6 +- .../types/logpush/job_list_response.py | 82 ++++++++++++ .../types/logpush/job_update_params.py | 2 +- .../types/logpush/job_update_response.py | 82 ++++++++++++ .../logpush/{datasets => }/output_options.py | 2 +- .../{datasets => }/output_options_param.py | 2 +- .../types/magic_transit/sites/__init__.py | 4 +- .../types/magic_transit/sites/acl.py | 4 +- .../magic_transit/sites/acl_create_params.py | 4 +- .../magic_transit/sites/acl_update_params.py | 4 +- .../magic_transit/sites/allowed_protocol.py | 7 ++ ...ma_ref_87fa9e5fe9f6b8d607be1df57340d916.py | 7 -- .../hostnames/__init__.py | 3 + .../hostnames/certificate_create_response.py | 45 +++++++ .../hostnames/certificate_delete_response.py | 45 +++++++ .../hostnames/certificate_get_response.py | 45 +++++++ src/cloudflare/types/queues/__init__.py | 3 - .../types/queues/consumer_create_response.py | 14 ++- .../types/queues/consumer_get_response.py | 14 ++- ...ma_ref_fbd3a4642487e41594e9af0ccb9a5ca5.py | 16 --- ...8102a27500f986488c1e8.py => rule_match.py} | 4 +- ...50b6bd72cdf37ecfd869.py => scan_status.py} | 4 +- .../types/secondary_dns/__init__.py | 5 +- .../types/secondary_dns/outgoing/__init__.py | 2 + .../types/secondary_dns/outgoing/outgoing.py | 29 +++++ .../secondary_dns/peer_create_response.py | 38 ++++++ .../{peer.py => peer_get_response.py} | 4 +- .../types/secondary_dns/peer_list_response.py | 38 ++++++ .../secondary_dns/peer_update_response.py | 38 ++++++ src/cloudflare/types/submit.py | 32 +++-- ...ma_ref_209db30ed499548152d6f3bccf720b54.py | 15 --- ...ma_ref_39419d70e2399b28b15cd660afd342fb.py | 15 --- ...ma_ref_44e66100b948bfe723054c56b6144766.py | 15 --- ...ma_ref_767c0981cf47f45f0c766253dbd18669.py | 12 -- ...89ebc7014.py => url_info_model_results.py} | 4 +- .../types/workers/scripts/__init__.py | 5 +- ...937f9d6f96fd69644e56b26.py => schedule.py} | 4 +- .../workers/scripts/schedule_get_response.py | 4 +- .../types/workers/scripts/schedule_param.py | 11 ++ .../scripts/schedule_update_response.py | 4 +- .../api_resources/addressing/test_prefixes.py | 53 ++++---- tests/api_resources/logpush/test_jobs.py | 73 ++++++----- .../hostnames/test_certificates.py | 40 +++--- .../api_resources/secondary_dns/test_peers.py | 57 +++++---- 70 files changed, 1299 insertions(+), 542 deletions(-) create mode 100644 src/cloudflare/types/addressing/prefix_create_response.py create mode 100644 src/cloudflare/types/addressing/prefix_edit_response.py rename src/cloudflare/types/addressing/{prefix.py => prefix_get_response.py} (95%) create mode 100644 src/cloudflare/types/addressing/prefix_list_response.py rename src/cloudflare/types/firewall/waf/packages/{unnamed_schema_ref_532d8b97684c9032dd36bae8acddebf5.py => waf_rule_group.py} (70%) create mode 100644 src/cloudflare/types/logpush/job_create_response.py rename src/cloudflare/types/logpush/{datasets/job.py => job_get_response.py} (96%) create mode 100644 src/cloudflare/types/logpush/job_list_response.py create mode 100644 src/cloudflare/types/logpush/job_update_response.py rename src/cloudflare/types/logpush/{datasets => }/output_options.py (98%) rename src/cloudflare/types/logpush/{datasets => }/output_options_param.py (98%) create mode 100644 src/cloudflare/types/magic_transit/sites/allowed_protocol.py delete mode 100644 src/cloudflare/types/magic_transit/sites/unnamed_schema_ref_87fa9e5fe9f6b8d607be1df57340d916.py create mode 100644 src/cloudflare/types/origin_tls_client_auth/hostnames/certificate_create_response.py create mode 100644 src/cloudflare/types/origin_tls_client_auth/hostnames/certificate_delete_response.py create mode 100644 src/cloudflare/types/origin_tls_client_auth/hostnames/certificate_get_response.py delete mode 100644 src/cloudflare/types/queues/unnamed_schema_ref_fbd3a4642487e41594e9af0ccb9a5ca5.py rename src/cloudflare/types/{unnamed_schema_ref_3e10ea08deb8102a27500f986488c1e8.py => rule_match.py} (77%) rename src/cloudflare/types/{unnamed_schema_ref_a64e2a18a86750b6bd72cdf37ecfd869.py => scan_status.py} (80%) create mode 100644 src/cloudflare/types/secondary_dns/outgoing/outgoing.py create mode 100644 src/cloudflare/types/secondary_dns/peer_create_response.py rename src/cloudflare/types/secondary_dns/{peer.py => peer_get_response.py} (94%) create mode 100644 src/cloudflare/types/secondary_dns/peer_list_response.py create mode 100644 src/cloudflare/types/secondary_dns/peer_update_response.py delete mode 100644 src/cloudflare/types/unnamed_schema_ref_209db30ed499548152d6f3bccf720b54.py delete mode 100644 src/cloudflare/types/unnamed_schema_ref_39419d70e2399b28b15cd660afd342fb.py delete mode 100644 src/cloudflare/types/unnamed_schema_ref_44e66100b948bfe723054c56b6144766.py delete mode 100644 src/cloudflare/types/unnamed_schema_ref_767c0981cf47f45f0c766253dbd18669.py rename src/cloudflare/types/{unnamed_schema_ref_9b4c9779a35b172cb69c71389ebc7014.py => url_info_model_results.py} (77%) rename src/cloudflare/types/workers/scripts/{unnamed_schema_ref_c8302c265937f9d6f96fd69644e56b26.py => schedule.py} (67%) create mode 100644 src/cloudflare/types/workers/scripts/schedule_param.py diff --git a/api.md b/api.md index 22b6ea0888a..3bbdf78e9a6 100644 --- a/api.md +++ b/api.md @@ -1967,7 +1967,7 @@ Types: ```python from cloudflare.types.firewall.waf.packages import ( AllowedModesAnomaly, - UnnamedSchemaRef532d8b97684c9032dd36bae8acddebf5, + WAFRuleGroup, RuleListResponse, RuleEditResponse, RuleGetResponse, @@ -1991,7 +1991,6 @@ from cloudflare.types import ( HTTPConfiguration, QueryHealthcheck, TCPConfiguration, - UnnamedSchemaRefAaa560acadcbf1ae1dc619ba1ea5948e, HealthcheckDeleteResponse, ) ``` @@ -2024,13 +2023,7 @@ Methods: Types: ```python -from cloudflare.types import ( - Hostname, - KeylessCertificate, - Tunnel, - UnnamedSchemaRefA91f0bd72ee433f010eecfdc94ccf298, - KeylessCertificateDeleteResponse, -) +from cloudflare.types import Hostname, KeylessCertificate, Tunnel, KeylessCertificateDeleteResponse ``` Methods: @@ -2062,7 +2055,7 @@ Methods: Types: ```python -from cloudflare.types.logpush.datasets import Job, OutputOptions, JobGetResponse +from cloudflare.types.logpush.datasets import JobGetResponse ``` Methods: @@ -2088,18 +2081,23 @@ Types: ```python from cloudflare.types.logpush import ( - UnnamedSchemaRef2f2e9d7fbcc0e6856257a03a1dbbdfb5, + LogpushJob, + OutputOptions, + JobCreateResponse, + JobUpdateResponse, + JobListResponse, JobDeleteResponse, + JobGetResponse, ) ``` Methods: -- client.logpush.jobs.create(\*, account_id, zone_id, \*\*params) -> Optional -- client.logpush.jobs.update(job_id, \*, account_id, zone_id, \*\*params) -> Optional -- client.logpush.jobs.list(\*, account_id, zone_id) -> SyncSinglePage[Optional] +- client.logpush.jobs.create(\*, account_id, zone_id, \*\*params) -> Optional +- client.logpush.jobs.update(job_id, \*, account_id, zone_id, \*\*params) -> Optional +- client.logpush.jobs.list(\*, account_id, zone_id) -> SyncSinglePage[Optional] - client.logpush.jobs.delete(job_id, \*, account_id, zone_id, \*\*params) -> Optional -- client.logpush.jobs.get(job_id, \*, account_id, zone_id) -> Optional +- client.logpush.jobs.get(job_id, \*, account_id, zone_id) -> Optional ## Ownership @@ -2242,16 +2240,18 @@ Types: ```python from cloudflare.types.origin_tls_client_auth.hostnames import ( Certificate, - UnnamedSchemaRefD182888b36f93a765d9ce5aefa3009e9, + CertificateCreateResponse, + CertificateDeleteResponse, + CertificateGetResponse, ) ``` Methods: -- client.origin_tls_client_auth.hostnames.certificates.create(\*, zone_id, \*\*params) -> Certificate +- client.origin_tls_client_auth.hostnames.certificates.create(\*, zone_id, \*\*params) -> CertificateCreateResponse - client.origin_tls_client_auth.hostnames.certificates.list(\*, zone_id) -> SyncSinglePage[AuthenticatedOriginPull] -- client.origin_tls_client_auth.hostnames.certificates.delete(certificate_id, \*, zone_id, \*\*params) -> Certificate -- client.origin_tls_client_auth.hostnames.certificates.get(certificate_id, \*, zone_id) -> Certificate +- client.origin_tls_client_auth.hostnames.certificates.delete(certificate_id, \*, zone_id, \*\*params) -> CertificateDeleteResponse +- client.origin_tls_client_auth.hostnames.certificates.get(certificate_id, \*, zone_id) -> CertificateGetResponse ## Settings @@ -2344,13 +2344,13 @@ Methods: - client.secondary_dns.force_axfr.create(\*, zone_id, \*\*params) -> str -## Incoming +## IncomingResource Types: ```python from cloudflare.types.secondary_dns import ( - UnnamedSchemaRef150c555e27f53dbb40cdce4d6644ff0a, + Incoming, IncomingCreateResponse, IncomingUpdateResponse, IncomingDeleteResponse, @@ -2365,7 +2365,7 @@ Methods: - client.secondary_dns.incoming.delete(\*, zone_id, \*\*params) -> IncomingDeleteResponse - client.secondary_dns.incoming.get(\*, zone_id) -> IncomingGetResponse -## Outgoing +## OutgoingResource Types: @@ -2373,8 +2373,8 @@ Types: from cloudflare.types.secondary_dns import ( DisableTransfer, EnableTransfer, + Outgoing, OutgoingStatus, - UnnamedSchemaRef0e152c3e4c55b8a0ca6531578a42c564, OutgoingCreateResponse, OutgoingUpdateResponse, OutgoingDeleteResponse, @@ -2422,18 +2422,21 @@ Types: ```python from cloudflare.types.secondary_dns import ( Peer, - UnnamedSchemaRefBc727f0a53d75f2b531245a82603fbe0, + PeerCreateResponse, + PeerUpdateResponse, + PeerListResponse, PeerDeleteResponse, + PeerGetResponse, ) ``` Methods: -- client.secondary_dns.peers.create(\*, account_id, \*\*params) -> Peer -- client.secondary_dns.peers.update(peer_id, \*, account_id, \*\*params) -> Peer -- client.secondary_dns.peers.list(\*, account_id) -> SyncSinglePage[Peer] +- client.secondary_dns.peers.create(\*, account_id, \*\*params) -> PeerCreateResponse +- client.secondary_dns.peers.update(peer_id, \*, account_id, \*\*params) -> PeerUpdateResponse +- client.secondary_dns.peers.list(\*, account_id) -> SyncSinglePage[PeerListResponse] - client.secondary_dns.peers.delete(peer_id, \*, account_id, \*\*params) -> PeerDeleteResponse -- client.secondary_dns.peers.get(peer_id, \*, account_id) -> Peer +- client.secondary_dns.peers.get(peer_id, \*, account_id) -> PeerGetResponse ## TSIGs @@ -2491,11 +2494,7 @@ Methods: Types: ```python -from cloudflare.types.waiting_rooms import ( - Event, - UnnamedSchemaRef229c159575bc68a9c21f5a1615629cf6, - EventDeleteResponse, -) +from cloudflare.types.waiting_rooms import Event, EventDeleteResponse ``` Methods: @@ -2525,7 +2524,6 @@ Types: ```python from cloudflare.types.waiting_rooms import ( - UnnamedSchemaRefF1c0ba8f44601f2db2e07b9397b6c430, WaitingRoomRule, RuleCreateResponse, RuleUpdateResponse, @@ -2580,11 +2578,7 @@ Methods: Types: ```python -from cloudflare.types.web3 import ( - Hostname, - UnnamedSchemaRef2e420942fb77cd2cd2ba3ca7b5f32e1e, - HostnameDeleteResponse, -) +from cloudflare.types.web3 import Hostname, HostnameDeleteResponse ``` Methods: @@ -2616,7 +2610,6 @@ Types: ```python from cloudflare.types.web3.hostnames.ipfs_universal_paths.content_lists import ( - UnnamedSchemaRef5e618833803e286db9ee7c73727f8b86, EntryCreateResponse, EntryUpdateResponse, EntryListResponse, @@ -2687,11 +2680,7 @@ Methods: Types: ```python -from cloudflare.types.workers.scripts import ( - UnnamedSchemaRefC8302c265937f9d6f96fd69644e56b26, - ScheduleUpdateResponse, - ScheduleGetResponse, -) +from cloudflare.types.workers.scripts import Schedule, ScheduleUpdateResponse, ScheduleGetResponse ``` Methods: @@ -2939,7 +2928,6 @@ Types: ```python from cloudflare.types.queues import ( Consumer, - UnnamedSchemaRefFbd3a4642487e41594e9af0ccb9a5ca5, ConsumerCreateResponse, ConsumerUpdateResponse, ConsumerDeleteResponse, @@ -3328,18 +3316,21 @@ Types: ```python from cloudflare.types.addressing import ( Prefix, - UnnamedSchemaRefE358666e049bf8f9281c0a4f89b5fe46, + PrefixCreateResponse, + PrefixListResponse, PrefixDeleteResponse, + PrefixEditResponse, + PrefixGetResponse, ) ``` Methods: -- client.addressing.prefixes.create(\*, account_id, \*\*params) -> Prefix -- client.addressing.prefixes.list(\*, account_id) -> SyncSinglePage[Prefix] +- client.addressing.prefixes.create(\*, account_id, \*\*params) -> PrefixCreateResponse +- client.addressing.prefixes.list(\*, account_id) -> SyncSinglePage[PrefixListResponse] - client.addressing.prefixes.delete(prefix_id, \*, account_id, \*\*params) -> Optional -- client.addressing.prefixes.edit(prefix_id, \*, account_id, \*\*params) -> Prefix -- client.addressing.prefixes.get(prefix_id, \*, account_id) -> Prefix +- client.addressing.prefixes.edit(prefix_id, \*, account_id, \*\*params) -> PrefixEditResponse +- client.addressing.prefixes.get(prefix_id, \*, account_id) -> PrefixGetResponse ### BGP @@ -3430,17 +3421,7 @@ Methods: Types: ```python -from cloudflare.types import ( - Info, - Submit, - UnnamedSchemaRef209db30ed499548152d6f3bccf720b54, - UnnamedSchemaRef39419d70e2399b28b15cd660afd342fb, - UnnamedSchemaRef3e10ea08deb8102a27500f986488c1e8, - UnnamedSchemaRef44e66100b948bfe723054c56b6144766, - UnnamedSchemaRef767c0981cf47f45f0c766253dbd18669, - UnnamedSchemaRef9b4c9779a35b172cb69c71389ebc7014, - UnnamedSchemaRefA64e2a18a86750b6bd72cdf37ecfd869, -) +from cloudflare.types import Info, RuleMatch, ScanStatus, Submit, URLInfoModelResults ``` Methods: @@ -3469,12 +3450,7 @@ Methods: Types: ```python -from cloudflare.types.images import ( - Image, - UnnamedSchemaRefE8461c343d70f42d35d6d68f1a58d05a, - V1ListResponse, - V1DeleteResponse, -) +from cloudflare.types.images import Image, V1ListResponse, V1DeleteResponse ``` Methods: @@ -3490,7 +3466,7 @@ Methods: Types: ```python -from cloudflare.types.images.v1 import Key, UnnamedSchemaRef918e794287a67b5e85126e00cf2d9a95 +from cloudflare.types.images.v1 import Key ``` Methods: @@ -3517,7 +3493,6 @@ Types: ```python from cloudflare.types.images.v1 import ( - UnnamedSchemaRefD02195de7dadf27801875f36cddfa3a3, Variant, VariantCreateResponse, VariantDeleteResponse, @@ -3915,8 +3890,8 @@ Types: from cloudflare.types.magic_transit.sites import ( ACL, ACLConfiguration, + AllowedProtocol, Subnet, - UnnamedSchemaRef87fa9e5fe9f6b8d607be1df57340d916, ACLCreateResponse, ACLUpdateResponse, ACLListResponse, diff --git a/src/cloudflare/resources/addressing/prefixes/prefixes.py b/src/cloudflare/resources/addressing/prefixes/prefixes.py index e187e9f4a55..0243cefbdf9 100644 --- a/src/cloudflare/resources/addressing/prefixes/prefixes.py +++ b/src/cloudflare/resources/addressing/prefixes/prefixes.py @@ -43,7 +43,10 @@ make_request_options, ) from ....types.addressing import ( - Prefix, + PrefixGetResponse, + PrefixEditResponse, + PrefixListResponse, + PrefixCreateResponse, PrefixDeleteResponse, prefix_edit_params, prefix_create_params, @@ -83,7 +86,7 @@ def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Prefix: + ) -> PrefixCreateResponse: """ Add a new prefix under the account. @@ -123,7 +126,7 @@ def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Prefix], ResultWrapper[Prefix]), + cast_to=cast(Type[PrefixCreateResponse], ResultWrapper[PrefixCreateResponse]), ) def list( @@ -136,7 +139,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> SyncSinglePage[Prefix]: + ) -> SyncSinglePage[PrefixListResponse]: """ List all prefixes owned by the account. @@ -155,11 +158,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}/addressing/prefixes", - page=SyncSinglePage[Prefix], + page=SyncSinglePage[PrefixListResponse], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=Prefix, + model=PrefixListResponse, ) def delete( @@ -225,7 +228,7 @@ def edit( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Prefix: + ) -> PrefixEditResponse: """ Modify the description for a prefix owned by the account. @@ -258,7 +261,7 @@ def edit( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Prefix], ResultWrapper[Prefix]), + cast_to=cast(Type[PrefixEditResponse], ResultWrapper[PrefixEditResponse]), ) def get( @@ -272,7 +275,7 @@ def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Prefix: + ) -> PrefixGetResponse: """ List a particular prefix owned by the account. @@ -302,7 +305,7 @@ def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Prefix], ResultWrapper[Prefix]), + cast_to=cast(Type[PrefixGetResponse], ResultWrapper[PrefixGetResponse]), ) @@ -336,7 +339,7 @@ async def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Prefix: + ) -> PrefixCreateResponse: """ Add a new prefix under the account. @@ -376,7 +379,7 @@ async def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Prefix], ResultWrapper[Prefix]), + cast_to=cast(Type[PrefixCreateResponse], ResultWrapper[PrefixCreateResponse]), ) def list( @@ -389,7 +392,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> AsyncPaginator[Prefix, AsyncSinglePage[Prefix]]: + ) -> AsyncPaginator[PrefixListResponse, AsyncSinglePage[PrefixListResponse]]: """ List all prefixes owned by the account. @@ -408,11 +411,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}/addressing/prefixes", - page=AsyncSinglePage[Prefix], + page=AsyncSinglePage[PrefixListResponse], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=Prefix, + model=PrefixListResponse, ) async def delete( @@ -478,7 +481,7 @@ async def edit( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Prefix: + ) -> PrefixEditResponse: """ Modify the description for a prefix owned by the account. @@ -511,7 +514,7 @@ async def edit( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Prefix], ResultWrapper[Prefix]), + cast_to=cast(Type[PrefixEditResponse], ResultWrapper[PrefixEditResponse]), ) async def get( @@ -525,7 +528,7 @@ async def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Prefix: + ) -> PrefixGetResponse: """ List a particular prefix owned by the account. @@ -555,7 +558,7 @@ async def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Prefix], ResultWrapper[Prefix]), + cast_to=cast(Type[PrefixGetResponse], ResultWrapper[PrefixGetResponse]), ) diff --git a/src/cloudflare/resources/logpush/jobs.py b/src/cloudflare/resources/logpush/jobs.py index 5724b344c21..784d6b09aba 100644 --- a/src/cloudflare/resources/logpush/jobs.py +++ b/src/cloudflare/resources/logpush/jobs.py @@ -26,8 +26,17 @@ AsyncPaginator, make_request_options, ) -from ...types.logpush import JobDeleteResponse, job_create_params, job_delete_params, job_update_params -from ...types.logpush.datasets import Job, OutputOptionsParam +from ...types.logpush import ( + JobGetResponse, + JobListResponse, + JobCreateResponse, + JobDeleteResponse, + JobUpdateResponse, + OutputOptionsParam, + job_create_params, + job_delete_params, + job_update_params, +) __all__ = ["Jobs", "AsyncJobs"] @@ -60,7 +69,7 @@ def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[Job]: + ) -> Optional[JobCreateResponse]: """ Creates a new Logpush job for an account or zone. @@ -141,7 +150,7 @@ def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Optional[Job]], ResultWrapper[Job]), + cast_to=cast(Type[Optional[JobCreateResponse]], ResultWrapper[JobCreateResponse]), ) def update( @@ -162,7 +171,7 @@ def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[Job]: + ) -> Optional[JobUpdateResponse]: """ Updates a Logpush job. @@ -237,7 +246,7 @@ def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Optional[Job]], ResultWrapper[Job]), + cast_to=cast(Type[Optional[JobUpdateResponse]], ResultWrapper[JobUpdateResponse]), ) def list( @@ -251,7 +260,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> SyncSinglePage[Optional[Job]]: + ) -> SyncSinglePage[Optional[JobListResponse]]: """ Lists Logpush jobs for an account or zone. @@ -285,11 +294,11 @@ def list( account_or_zone_id = zone_id return self._get_api_list( f"/{account_or_zone}/{account_or_zone_id}/logpush/jobs", - page=SyncSinglePage[Optional[Job]], + page=SyncSinglePage[Optional[JobListResponse]], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=Job, + model=JobListResponse, ) def delete( @@ -369,7 +378,7 @@ def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[Job]: + ) -> Optional[JobGetResponse]: """ Gets the details of a Logpush job. @@ -412,7 +421,7 @@ def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Optional[Job]], ResultWrapper[Job]), + cast_to=cast(Type[Optional[JobGetResponse]], ResultWrapper[JobGetResponse]), ) @@ -444,7 +453,7 @@ async def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[Job]: + ) -> Optional[JobCreateResponse]: """ Creates a new Logpush job for an account or zone. @@ -525,7 +534,7 @@ async def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Optional[Job]], ResultWrapper[Job]), + cast_to=cast(Type[Optional[JobCreateResponse]], ResultWrapper[JobCreateResponse]), ) async def update( @@ -546,7 +555,7 @@ async def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[Job]: + ) -> Optional[JobUpdateResponse]: """ Updates a Logpush job. @@ -621,7 +630,7 @@ async def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Optional[Job]], ResultWrapper[Job]), + cast_to=cast(Type[Optional[JobUpdateResponse]], ResultWrapper[JobUpdateResponse]), ) def list( @@ -635,7 +644,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> AsyncPaginator[Optional[Job], AsyncSinglePage[Optional[Job]]]: + ) -> AsyncPaginator[Optional[JobListResponse], AsyncSinglePage[Optional[JobListResponse]]]: """ Lists Logpush jobs for an account or zone. @@ -669,11 +678,11 @@ def list( account_or_zone_id = zone_id return self._get_api_list( f"/{account_or_zone}/{account_or_zone_id}/logpush/jobs", - page=AsyncSinglePage[Optional[Job]], + page=AsyncSinglePage[Optional[JobListResponse]], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=Job, + model=JobListResponse, ) async def delete( @@ -753,7 +762,7 @@ async def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[Job]: + ) -> Optional[JobGetResponse]: """ Gets the details of a Logpush job. @@ -796,7 +805,7 @@ async def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Optional[Job]], ResultWrapper[Job]), + cast_to=cast(Type[Optional[JobGetResponse]], ResultWrapper[JobGetResponse]), ) diff --git a/src/cloudflare/resources/origin_tls_client_auth/hostnames/certificates.py b/src/cloudflare/resources/origin_tls_client_auth/hostnames/certificates.py index 5e6b5108291..7694a0ec5c4 100644 --- a/src/cloudflare/resources/origin_tls_client_auth/hostnames/certificates.py +++ b/src/cloudflare/resources/origin_tls_client_auth/hostnames/certificates.py @@ -26,7 +26,13 @@ make_request_options, ) from ....types.origin_tls_client_auth import AuthenticatedOriginPull -from ....types.origin_tls_client_auth.hostnames import Certificate, certificate_create_params, certificate_delete_params +from ....types.origin_tls_client_auth.hostnames import ( + CertificateGetResponse, + CertificateCreateResponse, + CertificateDeleteResponse, + certificate_create_params, + certificate_delete_params, +) __all__ = ["Certificates", "AsyncCertificates"] @@ -52,7 +58,7 @@ def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Certificate: + ) -> CertificateCreateResponse: """Upload a certificate to be used for client authentication on a hostname. 10 @@ -91,7 +97,7 @@ def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Certificate], ResultWrapper[Certificate]), + cast_to=cast(Type[CertificateCreateResponse], ResultWrapper[CertificateCreateResponse]), ) def list( @@ -142,7 +148,7 @@ def delete( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Certificate: + ) -> CertificateDeleteResponse: """ Delete Hostname Client Certificate @@ -173,7 +179,7 @@ def delete( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Certificate], ResultWrapper[Certificate]), + cast_to=cast(Type[CertificateDeleteResponse], ResultWrapper[CertificateDeleteResponse]), ) def get( @@ -187,7 +193,7 @@ def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Certificate: + ) -> CertificateGetResponse: """ Get the certificate by ID to be used for client authentication on a hostname. @@ -217,7 +223,7 @@ def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Certificate], ResultWrapper[Certificate]), + cast_to=cast(Type[CertificateGetResponse], ResultWrapper[CertificateGetResponse]), ) @@ -242,7 +248,7 @@ async def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Certificate: + ) -> CertificateCreateResponse: """Upload a certificate to be used for client authentication on a hostname. 10 @@ -281,7 +287,7 @@ async def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Certificate], ResultWrapper[Certificate]), + cast_to=cast(Type[CertificateCreateResponse], ResultWrapper[CertificateCreateResponse]), ) def list( @@ -332,7 +338,7 @@ async def delete( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Certificate: + ) -> CertificateDeleteResponse: """ Delete Hostname Client Certificate @@ -363,7 +369,7 @@ async def delete( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Certificate], ResultWrapper[Certificate]), + cast_to=cast(Type[CertificateDeleteResponse], ResultWrapper[CertificateDeleteResponse]), ) async def get( @@ -377,7 +383,7 @@ async def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Certificate: + ) -> CertificateGetResponse: """ Get the certificate by ID to be used for client authentication on a hostname. @@ -407,7 +413,7 @@ async def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Certificate], ResultWrapper[Certificate]), + cast_to=cast(Type[CertificateGetResponse], ResultWrapper[CertificateGetResponse]), ) diff --git a/src/cloudflare/resources/secondary_dns/__init__.py b/src/cloudflare/resources/secondary_dns/__init__.py index 6f6cd59f286..749889de106 100644 --- a/src/cloudflare/resources/secondary_dns/__init__.py +++ b/src/cloudflare/resources/secondary_dns/__init__.py @@ -25,20 +25,20 @@ AsyncTSIGsWithStreamingResponse, ) from .incoming import ( - Incoming, - AsyncIncoming, - IncomingWithRawResponse, - AsyncIncomingWithRawResponse, - IncomingWithStreamingResponse, - AsyncIncomingWithStreamingResponse, + IncomingResource, + AsyncIncomingResource, + IncomingResourceWithRawResponse, + AsyncIncomingResourceWithRawResponse, + IncomingResourceWithStreamingResponse, + AsyncIncomingResourceWithStreamingResponse, ) from .outgoing import ( - Outgoing, - AsyncOutgoing, - OutgoingWithRawResponse, - AsyncOutgoingWithRawResponse, - OutgoingWithStreamingResponse, - AsyncOutgoingWithStreamingResponse, + OutgoingResource, + AsyncOutgoingResource, + OutgoingResourceWithRawResponse, + AsyncOutgoingResourceWithRawResponse, + OutgoingResourceWithStreamingResponse, + AsyncOutgoingResourceWithStreamingResponse, ) from .force_axfr import ( ForceAXFRResource, @@ -64,18 +64,18 @@ "AsyncForceAXFRResourceWithRawResponse", "ForceAXFRResourceWithStreamingResponse", "AsyncForceAXFRResourceWithStreamingResponse", - "Incoming", - "AsyncIncoming", - "IncomingWithRawResponse", - "AsyncIncomingWithRawResponse", - "IncomingWithStreamingResponse", - "AsyncIncomingWithStreamingResponse", - "Outgoing", - "AsyncOutgoing", - "OutgoingWithRawResponse", - "AsyncOutgoingWithRawResponse", - "OutgoingWithStreamingResponse", - "AsyncOutgoingWithStreamingResponse", + "IncomingResource", + "AsyncIncomingResource", + "IncomingResourceWithRawResponse", + "AsyncIncomingResourceWithRawResponse", + "IncomingResourceWithStreamingResponse", + "AsyncIncomingResourceWithStreamingResponse", + "OutgoingResource", + "AsyncOutgoingResource", + "OutgoingResourceWithRawResponse", + "AsyncOutgoingResourceWithRawResponse", + "OutgoingResourceWithStreamingResponse", + "AsyncOutgoingResourceWithStreamingResponse", "ACLs", "AsyncACLs", "ACLsWithRawResponse", diff --git a/src/cloudflare/resources/secondary_dns/incoming.py b/src/cloudflare/resources/secondary_dns/incoming.py index 26d75a843c2..336b3436e0a 100644 --- a/src/cloudflare/resources/secondary_dns/incoming.py +++ b/src/cloudflare/resources/secondary_dns/incoming.py @@ -33,17 +33,17 @@ incoming_update_params, ) -__all__ = ["Incoming", "AsyncIncoming"] +__all__ = ["IncomingResource", "AsyncIncomingResource"] -class Incoming(SyncAPIResource): +class IncomingResource(SyncAPIResource): @cached_property - def with_raw_response(self) -> IncomingWithRawResponse: - return IncomingWithRawResponse(self) + def with_raw_response(self) -> IncomingResourceWithRawResponse: + return IncomingResourceWithRawResponse(self) @cached_property - def with_streaming_response(self) -> IncomingWithStreamingResponse: - return IncomingWithStreamingResponse(self) + def with_streaming_response(self) -> IncomingResourceWithStreamingResponse: + return IncomingResourceWithStreamingResponse(self) def create( self, @@ -232,14 +232,14 @@ def get( ) -class AsyncIncoming(AsyncAPIResource): +class AsyncIncomingResource(AsyncAPIResource): @cached_property - def with_raw_response(self) -> AsyncIncomingWithRawResponse: - return AsyncIncomingWithRawResponse(self) + def with_raw_response(self) -> AsyncIncomingResourceWithRawResponse: + return AsyncIncomingResourceWithRawResponse(self) @cached_property - def with_streaming_response(self) -> AsyncIncomingWithStreamingResponse: - return AsyncIncomingWithStreamingResponse(self) + def with_streaming_response(self) -> AsyncIncomingResourceWithStreamingResponse: + return AsyncIncomingResourceWithStreamingResponse(self) async def create( self, @@ -428,8 +428,8 @@ async def get( ) -class IncomingWithRawResponse: - def __init__(self, incoming: Incoming) -> None: +class IncomingResourceWithRawResponse: + def __init__(self, incoming: IncomingResource) -> None: self._incoming = incoming self.create = to_raw_response_wrapper( @@ -446,8 +446,8 @@ def __init__(self, incoming: Incoming) -> None: ) -class AsyncIncomingWithRawResponse: - def __init__(self, incoming: AsyncIncoming) -> None: +class AsyncIncomingResourceWithRawResponse: + def __init__(self, incoming: AsyncIncomingResource) -> None: self._incoming = incoming self.create = async_to_raw_response_wrapper( @@ -464,8 +464,8 @@ def __init__(self, incoming: AsyncIncoming) -> None: ) -class IncomingWithStreamingResponse: - def __init__(self, incoming: Incoming) -> None: +class IncomingResourceWithStreamingResponse: + def __init__(self, incoming: IncomingResource) -> None: self._incoming = incoming self.create = to_streamed_response_wrapper( @@ -482,8 +482,8 @@ def __init__(self, incoming: Incoming) -> None: ) -class AsyncIncomingWithStreamingResponse: - def __init__(self, incoming: AsyncIncoming) -> None: +class AsyncIncomingResourceWithStreamingResponse: + def __init__(self, incoming: AsyncIncomingResource) -> None: self._incoming = incoming self.create = async_to_streamed_response_wrapper( diff --git a/src/cloudflare/resources/secondary_dns/outgoing/__init__.py b/src/cloudflare/resources/secondary_dns/outgoing/__init__.py index d54d2164137..cbac568c040 100644 --- a/src/cloudflare/resources/secondary_dns/outgoing/__init__.py +++ b/src/cloudflare/resources/secondary_dns/outgoing/__init__.py @@ -9,12 +9,12 @@ AsyncStatusWithStreamingResponse, ) from .outgoing import ( - Outgoing, - AsyncOutgoing, - OutgoingWithRawResponse, - AsyncOutgoingWithRawResponse, - OutgoingWithStreamingResponse, - AsyncOutgoingWithStreamingResponse, + OutgoingResource, + AsyncOutgoingResource, + OutgoingResourceWithRawResponse, + AsyncOutgoingResourceWithRawResponse, + OutgoingResourceWithStreamingResponse, + AsyncOutgoingResourceWithStreamingResponse, ) __all__ = [ @@ -24,10 +24,10 @@ "AsyncStatusWithRawResponse", "StatusWithStreamingResponse", "AsyncStatusWithStreamingResponse", - "Outgoing", - "AsyncOutgoing", - "OutgoingWithRawResponse", - "AsyncOutgoingWithRawResponse", - "OutgoingWithStreamingResponse", - "AsyncOutgoingWithStreamingResponse", + "OutgoingResource", + "AsyncOutgoingResource", + "OutgoingResourceWithRawResponse", + "AsyncOutgoingResourceWithRawResponse", + "OutgoingResourceWithStreamingResponse", + "AsyncOutgoingResourceWithStreamingResponse", ] diff --git a/src/cloudflare/resources/secondary_dns/outgoing/outgoing.py b/src/cloudflare/resources/secondary_dns/outgoing/outgoing.py index f324bf56a4d..a453dd56e0d 100644 --- a/src/cloudflare/resources/secondary_dns/outgoing/outgoing.py +++ b/src/cloudflare/resources/secondary_dns/outgoing/outgoing.py @@ -44,21 +44,21 @@ outgoing_force_notify_params, ) -__all__ = ["Outgoing", "AsyncOutgoing"] +__all__ = ["OutgoingResource", "AsyncOutgoingResource"] -class Outgoing(SyncAPIResource): +class OutgoingResource(SyncAPIResource): @cached_property def status(self) -> Status: return Status(self._client) @cached_property - def with_raw_response(self) -> OutgoingWithRawResponse: - return OutgoingWithRawResponse(self) + def with_raw_response(self) -> OutgoingResourceWithRawResponse: + return OutgoingResourceWithRawResponse(self) @cached_property - def with_streaming_response(self) -> OutgoingWithStreamingResponse: - return OutgoingWithStreamingResponse(self) + def with_streaming_response(self) -> OutgoingResourceWithStreamingResponse: + return OutgoingResourceWithStreamingResponse(self) def create( self, @@ -355,18 +355,18 @@ def get( ) -class AsyncOutgoing(AsyncAPIResource): +class AsyncOutgoingResource(AsyncAPIResource): @cached_property def status(self) -> AsyncStatus: return AsyncStatus(self._client) @cached_property - def with_raw_response(self) -> AsyncOutgoingWithRawResponse: - return AsyncOutgoingWithRawResponse(self) + def with_raw_response(self) -> AsyncOutgoingResourceWithRawResponse: + return AsyncOutgoingResourceWithRawResponse(self) @cached_property - def with_streaming_response(self) -> AsyncOutgoingWithStreamingResponse: - return AsyncOutgoingWithStreamingResponse(self) + def with_streaming_response(self) -> AsyncOutgoingResourceWithStreamingResponse: + return AsyncOutgoingResourceWithStreamingResponse(self) async def create( self, @@ -663,8 +663,8 @@ async def get( ) -class OutgoingWithRawResponse: - def __init__(self, outgoing: Outgoing) -> None: +class OutgoingResourceWithRawResponse: + def __init__(self, outgoing: OutgoingResource) -> None: self._outgoing = outgoing self.create = to_raw_response_wrapper( @@ -694,8 +694,8 @@ def status(self) -> StatusWithRawResponse: return StatusWithRawResponse(self._outgoing.status) -class AsyncOutgoingWithRawResponse: - def __init__(self, outgoing: AsyncOutgoing) -> None: +class AsyncOutgoingResourceWithRawResponse: + def __init__(self, outgoing: AsyncOutgoingResource) -> None: self._outgoing = outgoing self.create = async_to_raw_response_wrapper( @@ -725,8 +725,8 @@ def status(self) -> AsyncStatusWithRawResponse: return AsyncStatusWithRawResponse(self._outgoing.status) -class OutgoingWithStreamingResponse: - def __init__(self, outgoing: Outgoing) -> None: +class OutgoingResourceWithStreamingResponse: + def __init__(self, outgoing: OutgoingResource) -> None: self._outgoing = outgoing self.create = to_streamed_response_wrapper( @@ -756,8 +756,8 @@ def status(self) -> StatusWithStreamingResponse: return StatusWithStreamingResponse(self._outgoing.status) -class AsyncOutgoingWithStreamingResponse: - def __init__(self, outgoing: AsyncOutgoing) -> None: +class AsyncOutgoingResourceWithStreamingResponse: + def __init__(self, outgoing: AsyncOutgoingResource) -> None: self._outgoing = outgoing self.create = async_to_streamed_response_wrapper( diff --git a/src/cloudflare/resources/secondary_dns/peers.py b/src/cloudflare/resources/secondary_dns/peers.py index 8377b851212..0bb09fe0143 100644 --- a/src/cloudflare/resources/secondary_dns/peers.py +++ b/src/cloudflare/resources/secondary_dns/peers.py @@ -25,7 +25,16 @@ AsyncPaginator, make_request_options, ) -from ...types.secondary_dns import Peer, PeerDeleteResponse, peer_create_params, peer_delete_params, peer_update_params +from ...types.secondary_dns import ( + PeerGetResponse, + PeerListResponse, + PeerCreateResponse, + PeerDeleteResponse, + PeerUpdateResponse, + peer_create_params, + peer_delete_params, + peer_update_params, +) __all__ = ["Peers", "AsyncPeers"] @@ -50,7 +59,7 @@ def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Peer: + ) -> PeerCreateResponse: """ Create Peer. @@ -75,7 +84,7 @@ def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Peer], ResultWrapper[Peer]), + cast_to=cast(Type[PeerCreateResponse], ResultWrapper[PeerCreateResponse]), ) def update( @@ -94,7 +103,7 @@ def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Peer: + ) -> PeerUpdateResponse: """ Modify Peer. @@ -146,7 +155,7 @@ def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Peer], ResultWrapper[Peer]), + cast_to=cast(Type[PeerUpdateResponse], ResultWrapper[PeerUpdateResponse]), ) def list( @@ -159,7 +168,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> SyncSinglePage[Peer]: + ) -> SyncSinglePage[PeerListResponse]: """ List Peers. @@ -176,11 +185,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}/secondary_dns/peers", - page=SyncSinglePage[Peer], + page=SyncSinglePage[PeerListResponse], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=Peer, + model=PeerListResponse, ) def delete( @@ -236,7 +245,7 @@ def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Peer: + ) -> PeerGetResponse: """ Get Peer. @@ -262,7 +271,7 @@ def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Peer], ResultWrapper[Peer]), + cast_to=cast(Type[PeerGetResponse], ResultWrapper[PeerGetResponse]), ) @@ -286,7 +295,7 @@ async def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Peer: + ) -> PeerCreateResponse: """ Create Peer. @@ -311,7 +320,7 @@ async def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Peer], ResultWrapper[Peer]), + cast_to=cast(Type[PeerCreateResponse], ResultWrapper[PeerCreateResponse]), ) async def update( @@ -330,7 +339,7 @@ async def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Peer: + ) -> PeerUpdateResponse: """ Modify Peer. @@ -382,7 +391,7 @@ async def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Peer], ResultWrapper[Peer]), + cast_to=cast(Type[PeerUpdateResponse], ResultWrapper[PeerUpdateResponse]), ) def list( @@ -395,7 +404,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> AsyncPaginator[Peer, AsyncSinglePage[Peer]]: + ) -> AsyncPaginator[PeerListResponse, AsyncSinglePage[PeerListResponse]]: """ List Peers. @@ -412,11 +421,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}/secondary_dns/peers", - page=AsyncSinglePage[Peer], + page=AsyncSinglePage[PeerListResponse], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=Peer, + model=PeerListResponse, ) async def delete( @@ -472,7 +481,7 @@ async def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Peer: + ) -> PeerGetResponse: """ Get Peer. @@ -498,7 +507,7 @@ async def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Peer], ResultWrapper[Peer]), + cast_to=cast(Type[PeerGetResponse], ResultWrapper[PeerGetResponse]), ) diff --git a/src/cloudflare/resources/secondary_dns/secondary_dns.py b/src/cloudflare/resources/secondary_dns/secondary_dns.py index 59901d53621..8a9dc84d216 100644 --- a/src/cloudflare/resources/secondary_dns/secondary_dns.py +++ b/src/cloudflare/resources/secondary_dns/secondary_dns.py @@ -27,20 +27,20 @@ AsyncTSIGsWithStreamingResponse, ) from .incoming import ( - Incoming, - AsyncIncoming, - IncomingWithRawResponse, - AsyncIncomingWithRawResponse, - IncomingWithStreamingResponse, - AsyncIncomingWithStreamingResponse, + IncomingResource, + AsyncIncomingResource, + IncomingResourceWithRawResponse, + AsyncIncomingResourceWithRawResponse, + IncomingResourceWithStreamingResponse, + AsyncIncomingResourceWithStreamingResponse, ) from .outgoing import ( - Outgoing, - AsyncOutgoing, - OutgoingWithRawResponse, - AsyncOutgoingWithRawResponse, - OutgoingWithStreamingResponse, - AsyncOutgoingWithStreamingResponse, + OutgoingResource, + AsyncOutgoingResource, + OutgoingResourceWithRawResponse, + AsyncOutgoingResourceWithRawResponse, + OutgoingResourceWithStreamingResponse, + AsyncOutgoingResourceWithStreamingResponse, ) from ..._compat import cached_property from .force_axfr import ( @@ -52,7 +52,7 @@ AsyncForceAXFRResourceWithStreamingResponse, ) from ..._resource import SyncAPIResource, AsyncAPIResource -from .outgoing.outgoing import Outgoing, AsyncOutgoing +from .outgoing.outgoing import OutgoingResource, AsyncOutgoingResource __all__ = ["SecondaryDNS", "AsyncSecondaryDNS"] @@ -63,12 +63,12 @@ def force_axfr(self) -> ForceAXFRResource: return ForceAXFRResource(self._client) @cached_property - def incoming(self) -> Incoming: - return Incoming(self._client) + def incoming(self) -> IncomingResource: + return IncomingResource(self._client) @cached_property - def outgoing(self) -> Outgoing: - return Outgoing(self._client) + def outgoing(self) -> OutgoingResource: + return OutgoingResource(self._client) @cached_property def acls(self) -> ACLs: @@ -97,12 +97,12 @@ def force_axfr(self) -> AsyncForceAXFRResource: return AsyncForceAXFRResource(self._client) @cached_property - def incoming(self) -> AsyncIncoming: - return AsyncIncoming(self._client) + def incoming(self) -> AsyncIncomingResource: + return AsyncIncomingResource(self._client) @cached_property - def outgoing(self) -> AsyncOutgoing: - return AsyncOutgoing(self._client) + def outgoing(self) -> AsyncOutgoingResource: + return AsyncOutgoingResource(self._client) @cached_property def acls(self) -> AsyncACLs: @@ -134,12 +134,12 @@ def force_axfr(self) -> ForceAXFRResourceWithRawResponse: return ForceAXFRResourceWithRawResponse(self._secondary_dns.force_axfr) @cached_property - def incoming(self) -> IncomingWithRawResponse: - return IncomingWithRawResponse(self._secondary_dns.incoming) + def incoming(self) -> IncomingResourceWithRawResponse: + return IncomingResourceWithRawResponse(self._secondary_dns.incoming) @cached_property - def outgoing(self) -> OutgoingWithRawResponse: - return OutgoingWithRawResponse(self._secondary_dns.outgoing) + def outgoing(self) -> OutgoingResourceWithRawResponse: + return OutgoingResourceWithRawResponse(self._secondary_dns.outgoing) @cached_property def acls(self) -> ACLsWithRawResponse: @@ -163,12 +163,12 @@ def force_axfr(self) -> AsyncForceAXFRResourceWithRawResponse: return AsyncForceAXFRResourceWithRawResponse(self._secondary_dns.force_axfr) @cached_property - def incoming(self) -> AsyncIncomingWithRawResponse: - return AsyncIncomingWithRawResponse(self._secondary_dns.incoming) + def incoming(self) -> AsyncIncomingResourceWithRawResponse: + return AsyncIncomingResourceWithRawResponse(self._secondary_dns.incoming) @cached_property - def outgoing(self) -> AsyncOutgoingWithRawResponse: - return AsyncOutgoingWithRawResponse(self._secondary_dns.outgoing) + def outgoing(self) -> AsyncOutgoingResourceWithRawResponse: + return AsyncOutgoingResourceWithRawResponse(self._secondary_dns.outgoing) @cached_property def acls(self) -> AsyncACLsWithRawResponse: @@ -192,12 +192,12 @@ def force_axfr(self) -> ForceAXFRResourceWithStreamingResponse: return ForceAXFRResourceWithStreamingResponse(self._secondary_dns.force_axfr) @cached_property - def incoming(self) -> IncomingWithStreamingResponse: - return IncomingWithStreamingResponse(self._secondary_dns.incoming) + def incoming(self) -> IncomingResourceWithStreamingResponse: + return IncomingResourceWithStreamingResponse(self._secondary_dns.incoming) @cached_property - def outgoing(self) -> OutgoingWithStreamingResponse: - return OutgoingWithStreamingResponse(self._secondary_dns.outgoing) + def outgoing(self) -> OutgoingResourceWithStreamingResponse: + return OutgoingResourceWithStreamingResponse(self._secondary_dns.outgoing) @cached_property def acls(self) -> ACLsWithStreamingResponse: @@ -221,12 +221,12 @@ def force_axfr(self) -> AsyncForceAXFRResourceWithStreamingResponse: return AsyncForceAXFRResourceWithStreamingResponse(self._secondary_dns.force_axfr) @cached_property - def incoming(self) -> AsyncIncomingWithStreamingResponse: - return AsyncIncomingWithStreamingResponse(self._secondary_dns.incoming) + def incoming(self) -> AsyncIncomingResourceWithStreamingResponse: + return AsyncIncomingResourceWithStreamingResponse(self._secondary_dns.incoming) @cached_property - def outgoing(self) -> AsyncOutgoingWithStreamingResponse: - return AsyncOutgoingWithStreamingResponse(self._secondary_dns.outgoing) + def outgoing(self) -> AsyncOutgoingResourceWithStreamingResponse: + return AsyncOutgoingResourceWithStreamingResponse(self._secondary_dns.outgoing) @cached_property def acls(self) -> AsyncACLsWithStreamingResponse: diff --git a/src/cloudflare/types/__init__.py b/src/cloudflare/types/__init__.py index 488baa77ff9..a408356540a 100644 --- a/src/cloudflare/types/__init__.py +++ b/src/cloudflare/types/__init__.py @@ -49,12 +49,14 @@ from .origin_dns import OriginDNS as OriginDNS from .r2_binding import R2Binding as R2Binding from .rate_limit import RateLimit as RateLimit +from .rule_match import RuleMatch as RuleMatch from .healthcheck import Healthcheck as Healthcheck from .jdcloud_ips import JDCloudIPs as JDCloudIPs from .origin_port import OriginPort as OriginPort from .pcap_filter import PCAPFilter as PCAPFilter from .route_param import RouteParam as RouteParam from .rules_param import RulesParam as RulesParam +from .scan_status import ScanStatus as ScanStatus from .check_region import CheckRegion as CheckRegion from .header_param import HeaderParam as HeaderParam from .health_check import HealthCheck as HealthCheck @@ -173,6 +175,7 @@ from .rate_limit_edit_params import RateLimitEditParams as RateLimitEditParams from .rate_limit_list_params import RateLimitListParams as RateLimitListParams from .rate_plan_get_response import RatePlanGetResponse as RatePlanGetResponse +from .url_info_model_results import URLInfoModelResults as URLInfoModelResults from .account_update_response import AccountUpdateResponse as AccountUpdateResponse from .additional_routes_param import AdditionalRoutesParam as AdditionalRoutesParam from .audit_log_list_response import AuditLogListResponse as AuditLogListResponse @@ -323,48 +326,27 @@ from .origin_post_quantum_encryption_update_response import ( OriginPostQuantumEncryptionUpdateResponse as OriginPostQuantumEncryptionUpdateResponse, ) -from .unnamed_schema_ref_3e10ea08deb8102a27500f986488c1e8 import ( - UnnamedSchemaRef3e10ea08deb8102a27500f986488c1e8 as UnnamedSchemaRef3e10ea08deb8102a27500f986488c1e8, -) from .unnamed_schema_ref_8b383e904d9fb02521257ef9cc77d297 import ( UnnamedSchemaRef8b383e904d9fb02521257ef9cc77d297 as UnnamedSchemaRef8b383e904d9fb02521257ef9cc77d297, ) -from .unnamed_schema_ref_9b4c9779a35b172cb69c71389ebc7014 import ( - UnnamedSchemaRef9b4c9779a35b172cb69c71389ebc7014 as UnnamedSchemaRef9b4c9779a35b172cb69c71389ebc7014, -) from .unnamed_schema_ref_16e559c45a31db5480e21fbe904b2e42 import ( UnnamedSchemaRef16e559c45a31db5480e21fbe904b2e42 as UnnamedSchemaRef16e559c45a31db5480e21fbe904b2e42, ) -from .unnamed_schema_ref_44e66100b948bfe723054c56b6144766 import ( - UnnamedSchemaRef44e66100b948bfe723054c56b6144766 as UnnamedSchemaRef44e66100b948bfe723054c56b6144766, -) from .unnamed_schema_ref_75bae70cf28e6bcef364b9840db3bdeb import ( UnnamedSchemaRef75bae70cf28e6bcef364b9840db3bdeb as UnnamedSchemaRef75bae70cf28e6bcef364b9840db3bdeb, ) from .unnamed_schema_ref_83a14d589e799bc901b9ccc870251d09 import ( UnnamedSchemaRef83a14d589e799bc901b9ccc870251d09 as UnnamedSchemaRef83a14d589e799bc901b9ccc870251d09, ) -from .unnamed_schema_ref_209db30ed499548152d6f3bccf720b54 import ( - UnnamedSchemaRef209db30ed499548152d6f3bccf720b54 as UnnamedSchemaRef209db30ed499548152d6f3bccf720b54, -) -from .unnamed_schema_ref_767c0981cf47f45f0c766253dbd18669 import ( - UnnamedSchemaRef767c0981cf47f45f0c766253dbd18669 as UnnamedSchemaRef767c0981cf47f45f0c766253dbd18669, -) from .unnamed_schema_ref_4124a22436f90127c7fa2c4543219752 import ( UnnamedSchemaRef4124a22436f90127c7fa2c4543219752 as UnnamedSchemaRef4124a22436f90127c7fa2c4543219752, ) -from .unnamed_schema_ref_39419d70e2399b28b15cd660afd342fb import ( - UnnamedSchemaRef39419d70e2399b28b15cd660afd342fb as UnnamedSchemaRef39419d70e2399b28b15cd660afd342fb, -) from .unnamed_schema_ref_7826220e105d84352ba1108d9ed88e55 import ( UnnamedSchemaRef7826220e105d84352ba1108d9ed88e55 as UnnamedSchemaRef7826220e105d84352ba1108d9ed88e55, ) from .unnamed_schema_ref_9002274ed7cb7f3dc567421e31529a3a import ( UnnamedSchemaRef9002274ed7cb7f3dc567421e31529a3a as UnnamedSchemaRef9002274ed7cb7f3dc567421e31529a3a, ) -from .unnamed_schema_ref_a64e2a18a86750b6bd72cdf37ecfd869 import ( - UnnamedSchemaRefA64e2a18a86750b6bd72cdf37ecfd869 as UnnamedSchemaRefA64e2a18a86750b6bd72cdf37ecfd869, -) from .unnamed_schema_ref_b5f3bd1840490bc487ffef84567807b1 import ( UnnamedSchemaRefB5f3bd1840490bc487ffef84567807b1 as UnnamedSchemaRefB5f3bd1840490bc487ffef84567807b1, ) diff --git a/src/cloudflare/types/addressing/__init__.py b/src/cloudflare/types/addressing/__init__.py index 09699f91e4e..432f22b7e76 100644 --- a/src/cloudflare/types/addressing/__init__.py +++ b/src/cloudflare/types/addressing/__init__.py @@ -2,12 +2,15 @@ from __future__ import annotations -from .prefix import Prefix as Prefix from .address_map import AddressMap as AddressMap from .prefix_edit_params import PrefixEditParams as PrefixEditParams +from .prefix_get_response import PrefixGetResponse as PrefixGetResponse from .prefix_create_params import PrefixCreateParams as PrefixCreateParams from .prefix_delete_params import PrefixDeleteParams as PrefixDeleteParams +from .prefix_edit_response import PrefixEditResponse as PrefixEditResponse +from .prefix_list_response import PrefixListResponse as PrefixListResponse from .service_list_response import ServiceListResponse as ServiceListResponse +from .prefix_create_response import PrefixCreateResponse as PrefixCreateResponse from .prefix_delete_response import PrefixDeleteResponse as PrefixDeleteResponse from .address_map_edit_params import AddressMapEditParams as AddressMapEditParams from .address_map_get_response import AddressMapGetResponse as AddressMapGetResponse diff --git a/src/cloudflare/types/addressing/prefix_create_response.py b/src/cloudflare/types/addressing/prefix_create_response.py new file mode 100644 index 00000000000..3b65de87b01 --- /dev/null +++ b/src/cloudflare/types/addressing/prefix_create_response.py @@ -0,0 +1,59 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import Optional +from datetime import datetime + +from ..._models import BaseModel + +__all__ = ["PrefixCreateResponse"] + + +class PrefixCreateResponse(BaseModel): + id: Optional[str] = None + """Identifier""" + + account_id: Optional[str] = None + """Identifier""" + + advertised: Optional[bool] = None + """Prefix advertisement status to the Internet. + + This field is only not 'null' if on demand is enabled. + """ + + advertised_modified_at: Optional[datetime] = None + """Last time the advertisement status was changed. + + This field is only not 'null' if on demand is enabled. + """ + + approved: Optional[str] = None + """Approval state of the prefix (P = pending, V = active).""" + + asn: Optional[int] = None + """Autonomous System Number (ASN) the prefix will be advertised under.""" + + cidr: Optional[str] = None + """IP Prefix in Classless Inter-Domain Routing format.""" + + created_at: Optional[datetime] = None + + description: Optional[str] = None + """Description of the prefix.""" + + loa_document_id: Optional[str] = None + """Identifier for the uploaded LOA document.""" + + modified_at: Optional[datetime] = None + + on_demand_enabled: Optional[bool] = None + """ + Whether advertisement of the prefix to the Internet may be dynamically enabled + or disabled. + """ + + on_demand_locked: Optional[bool] = None + """ + Whether advertisement status of the prefix is locked, meaning it cannot be + changed. + """ diff --git a/src/cloudflare/types/addressing/prefix_edit_response.py b/src/cloudflare/types/addressing/prefix_edit_response.py new file mode 100644 index 00000000000..f01ab553be2 --- /dev/null +++ b/src/cloudflare/types/addressing/prefix_edit_response.py @@ -0,0 +1,59 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import Optional +from datetime import datetime + +from ..._models import BaseModel + +__all__ = ["PrefixEditResponse"] + + +class PrefixEditResponse(BaseModel): + id: Optional[str] = None + """Identifier""" + + account_id: Optional[str] = None + """Identifier""" + + advertised: Optional[bool] = None + """Prefix advertisement status to the Internet. + + This field is only not 'null' if on demand is enabled. + """ + + advertised_modified_at: Optional[datetime] = None + """Last time the advertisement status was changed. + + This field is only not 'null' if on demand is enabled. + """ + + approved: Optional[str] = None + """Approval state of the prefix (P = pending, V = active).""" + + asn: Optional[int] = None + """Autonomous System Number (ASN) the prefix will be advertised under.""" + + cidr: Optional[str] = None + """IP Prefix in Classless Inter-Domain Routing format.""" + + created_at: Optional[datetime] = None + + description: Optional[str] = None + """Description of the prefix.""" + + loa_document_id: Optional[str] = None + """Identifier for the uploaded LOA document.""" + + modified_at: Optional[datetime] = None + + on_demand_enabled: Optional[bool] = None + """ + Whether advertisement of the prefix to the Internet may be dynamically enabled + or disabled. + """ + + on_demand_locked: Optional[bool] = None + """ + Whether advertisement status of the prefix is locked, meaning it cannot be + changed. + """ diff --git a/src/cloudflare/types/addressing/prefix.py b/src/cloudflare/types/addressing/prefix_get_response.py similarity index 95% rename from src/cloudflare/types/addressing/prefix.py rename to src/cloudflare/types/addressing/prefix_get_response.py index 9dd12947704..2d989739cb2 100644 --- a/src/cloudflare/types/addressing/prefix.py +++ b/src/cloudflare/types/addressing/prefix_get_response.py @@ -5,10 +5,10 @@ from ..._models import BaseModel -__all__ = ["Prefix"] +__all__ = ["PrefixGetResponse"] -class Prefix(BaseModel): +class PrefixGetResponse(BaseModel): id: Optional[str] = None """Identifier""" diff --git a/src/cloudflare/types/addressing/prefix_list_response.py b/src/cloudflare/types/addressing/prefix_list_response.py new file mode 100644 index 00000000000..1dca5210ba7 --- /dev/null +++ b/src/cloudflare/types/addressing/prefix_list_response.py @@ -0,0 +1,59 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import Optional +from datetime import datetime + +from ..._models import BaseModel + +__all__ = ["PrefixListResponse"] + + +class PrefixListResponse(BaseModel): + id: Optional[str] = None + """Identifier""" + + account_id: Optional[str] = None + """Identifier""" + + advertised: Optional[bool] = None + """Prefix advertisement status to the Internet. + + This field is only not 'null' if on demand is enabled. + """ + + advertised_modified_at: Optional[datetime] = None + """Last time the advertisement status was changed. + + This field is only not 'null' if on demand is enabled. + """ + + approved: Optional[str] = None + """Approval state of the prefix (P = pending, V = active).""" + + asn: Optional[int] = None + """Autonomous System Number (ASN) the prefix will be advertised under.""" + + cidr: Optional[str] = None + """IP Prefix in Classless Inter-Domain Routing format.""" + + created_at: Optional[datetime] = None + + description: Optional[str] = None + """Description of the prefix.""" + + loa_document_id: Optional[str] = None + """Identifier for the uploaded LOA document.""" + + modified_at: Optional[datetime] = None + + on_demand_enabled: Optional[bool] = None + """ + Whether advertisement of the prefix to the Internet may be dynamically enabled + or disabled. + """ + + on_demand_locked: Optional[bool] = None + """ + Whether advertisement status of the prefix is locked, meaning it cannot be + changed. + """ diff --git a/src/cloudflare/types/firewall/waf/packages/__init__.py b/src/cloudflare/types/firewall/waf/packages/__init__.py index 944fccf42da..27d9c57807f 100644 --- a/src/cloudflare/types/firewall/waf/packages/__init__.py +++ b/src/cloudflare/types/firewall/waf/packages/__init__.py @@ -3,6 +3,7 @@ from __future__ import annotations from .group import Group as Group +from .waf_rule_group import WAFRuleGroup as WAFRuleGroup from .rule_edit_params import RuleEditParams as RuleEditParams from .rule_list_params import RuleListParams as RuleListParams from .group_edit_params import GroupEditParams as GroupEditParams @@ -13,6 +14,3 @@ from .rule_list_response import RuleListResponse as RuleListResponse from .group_edit_response import GroupEditResponse as GroupEditResponse from .allowed_modes_anomaly import AllowedModesAnomaly as AllowedModesAnomaly -from .unnamed_schema_ref_532d8b97684c9032dd36bae8acddebf5 import ( - UnnamedSchemaRef532d8b97684c9032dd36bae8acddebf5 as UnnamedSchemaRef532d8b97684c9032dd36bae8acddebf5, -) diff --git a/src/cloudflare/types/firewall/waf/packages/rule_edit_response.py b/src/cloudflare/types/firewall/waf/packages/rule_edit_response.py index e16e8bf2b87..3571df468f8 100644 --- a/src/cloudflare/types/firewall/waf/packages/rule_edit_response.py +++ b/src/cloudflare/types/firewall/waf/packages/rule_edit_response.py @@ -4,8 +4,8 @@ from typing_extensions import Literal from ....._models import BaseModel +from .waf_rule_group import WAFRuleGroup from .allowed_modes_anomaly import AllowedModesAnomaly -from .unnamed_schema_ref_532d8b97684c9032dd36bae8acddebf5 import UnnamedSchemaRef532d8b97684c9032dd36bae8acddebf5 __all__ = [ "RuleEditResponse", @@ -28,7 +28,7 @@ class WAFManagedRulesAnomalyRule(BaseModel): description: str """The public description of the WAF rule.""" - group: UnnamedSchemaRef532d8b97684c9032dd36bae8acddebf5 + group: WAFRuleGroup """The rule group to which the current WAF rule belongs.""" mode: Literal["on", "off"] @@ -57,7 +57,7 @@ class WAFManagedRulesTraditionalDenyRule(BaseModel): description: str """The public description of the WAF rule.""" - group: UnnamedSchemaRef532d8b97684c9032dd36bae8acddebf5 + group: WAFRuleGroup """The rule group to which the current WAF rule belongs.""" mode: Literal["default", "disable", "simulate", "block", "challenge"] @@ -85,7 +85,7 @@ class WAFManagedRulesTraditionalAllowRule(BaseModel): description: str """The public description of the WAF rule.""" - group: UnnamedSchemaRef532d8b97684c9032dd36bae8acddebf5 + group: WAFRuleGroup """The rule group to which the current WAF rule belongs.""" mode: Literal["on", "off"] diff --git a/src/cloudflare/types/firewall/waf/packages/rule_list_response.py b/src/cloudflare/types/firewall/waf/packages/rule_list_response.py index 602e3769254..1da4d6fdd5d 100644 --- a/src/cloudflare/types/firewall/waf/packages/rule_list_response.py +++ b/src/cloudflare/types/firewall/waf/packages/rule_list_response.py @@ -4,8 +4,8 @@ from typing_extensions import Literal from ....._models import BaseModel +from .waf_rule_group import WAFRuleGroup from .allowed_modes_anomaly import AllowedModesAnomaly -from .unnamed_schema_ref_532d8b97684c9032dd36bae8acddebf5 import UnnamedSchemaRef532d8b97684c9032dd36bae8acddebf5 __all__ = [ "RuleListResponse", @@ -28,7 +28,7 @@ class WAFManagedRulesAnomalyRule(BaseModel): description: str """The public description of the WAF rule.""" - group: UnnamedSchemaRef532d8b97684c9032dd36bae8acddebf5 + group: WAFRuleGroup """The rule group to which the current WAF rule belongs.""" mode: Literal["on", "off"] @@ -57,7 +57,7 @@ class WAFManagedRulesTraditionalDenyRule(BaseModel): description: str """The public description of the WAF rule.""" - group: UnnamedSchemaRef532d8b97684c9032dd36bae8acddebf5 + group: WAFRuleGroup """The rule group to which the current WAF rule belongs.""" mode: Literal["default", "disable", "simulate", "block", "challenge"] @@ -85,7 +85,7 @@ class WAFManagedRulesTraditionalAllowRule(BaseModel): description: str """The public description of the WAF rule.""" - group: UnnamedSchemaRef532d8b97684c9032dd36bae8acddebf5 + group: WAFRuleGroup """The rule group to which the current WAF rule belongs.""" mode: Literal["on", "off"] diff --git a/src/cloudflare/types/firewall/waf/packages/unnamed_schema_ref_532d8b97684c9032dd36bae8acddebf5.py b/src/cloudflare/types/firewall/waf/packages/waf_rule_group.py similarity index 70% rename from src/cloudflare/types/firewall/waf/packages/unnamed_schema_ref_532d8b97684c9032dd36bae8acddebf5.py rename to src/cloudflare/types/firewall/waf/packages/waf_rule_group.py index 410d72a0f65..2ce0dcabcad 100644 --- a/src/cloudflare/types/firewall/waf/packages/unnamed_schema_ref_532d8b97684c9032dd36bae8acddebf5.py +++ b/src/cloudflare/types/firewall/waf/packages/waf_rule_group.py @@ -4,10 +4,10 @@ from ....._models import BaseModel -__all__ = ["UnnamedSchemaRef532d8b97684c9032dd36bae8acddebf5"] +__all__ = ["WAFRuleGroup"] -class UnnamedSchemaRef532d8b97684c9032dd36bae8acddebf5(BaseModel): +class WAFRuleGroup(BaseModel): id: Optional[str] = None """The unique identifier of the rule group.""" diff --git a/src/cloudflare/types/info.py b/src/cloudflare/types/info.py index 8f0c1a5dfc8..cf5180c39ae 100644 --- a/src/cloudflare/types/info.py +++ b/src/cloudflare/types/info.py @@ -5,30 +5,35 @@ from pydantic import Field as FieldInfo from .._models import BaseModel -from .unnamed_schema_ref_3e10ea08deb8102a27500f986488c1e8 import UnnamedSchemaRef3e10ea08deb8102a27500f986488c1e8 -from .unnamed_schema_ref_9b4c9779a35b172cb69c71389ebc7014 import UnnamedSchemaRef9b4c9779a35b172cb69c71389ebc7014 -from .unnamed_schema_ref_209db30ed499548152d6f3bccf720b54 import UnnamedSchemaRef209db30ed499548152d6f3bccf720b54 -from .unnamed_schema_ref_a64e2a18a86750b6bd72cdf37ecfd869 import UnnamedSchemaRefA64e2a18a86750b6bd72cdf37ecfd869 +from .rule_match import RuleMatch +from .scan_status import ScanStatus +from .url_info_model_results import URLInfoModelResults -__all__ = ["Info"] +__all__ = ["Info", "Categorization"] + + +class Categorization(BaseModel): + category: Optional[str] = None + """Name of the category applied.""" + + verification_status: Optional[str] = None + """Result of human review for this categorization.""" class Info(BaseModel): - categorizations: Optional[List[UnnamedSchemaRef209db30ed499548152d6f3bccf720b54]] = None + categorizations: Optional[List[Categorization]] = None """List of categorizations applied to this submission.""" - ai_model_results: Optional[List[UnnamedSchemaRef9b4c9779a35b172cb69c71389ebc7014]] = FieldInfo( - alias="model_results", default=None - ) + ai_model_results: Optional[List[URLInfoModelResults]] = FieldInfo(alias="model_results", default=None) """List of model results for completed scans.""" - rule_matches: Optional[List[UnnamedSchemaRef3e10ea08deb8102a27500f986488c1e8]] = None + rule_matches: Optional[List[RuleMatch]] = None """ List of signatures that matched against site content found when crawling the URL. """ - scan_status: Optional[UnnamedSchemaRefA64e2a18a86750b6bd72cdf37ecfd869] = None + scan_status: Optional[ScanStatus] = None """Status of the most recent scan found.""" screenshot_download_signature: Optional[str] = None diff --git a/src/cloudflare/types/logpush/__init__.py b/src/cloudflare/types/logpush/__init__.py index 395f3560aa8..b5aac2564c6 100644 --- a/src/cloudflare/types/logpush/__init__.py +++ b/src/cloudflare/types/logpush/__init__.py @@ -2,13 +2,19 @@ from __future__ import annotations +from .output_options import OutputOptions as OutputOptions +from .job_get_response import JobGetResponse as JobGetResponse from .edge_get_response import EdgeGetResponse as EdgeGetResponse from .job_create_params import JobCreateParams as JobCreateParams from .job_delete_params import JobDeleteParams as JobDeleteParams +from .job_list_response import JobListResponse as JobListResponse from .job_update_params import JobUpdateParams as JobUpdateParams from .edge_create_params import EdgeCreateParams as EdgeCreateParams from .instant_logpush_job import InstantLogpushJob as InstantLogpushJob +from .job_create_response import JobCreateResponse as JobCreateResponse from .job_delete_response import JobDeleteResponse as JobDeleteResponse +from .job_update_response import JobUpdateResponse as JobUpdateResponse +from .output_options_param import OutputOptionsParam as OutputOptionsParam from .ownership_validation import OwnershipValidation as OwnershipValidation from .validate_origin_params import ValidateOriginParams as ValidateOriginParams from .ownership_create_params import OwnershipCreateParams as OwnershipCreateParams diff --git a/src/cloudflare/types/logpush/datasets/__init__.py b/src/cloudflare/types/logpush/datasets/__init__.py index f2739f78bc2..8c60dd28797 100644 --- a/src/cloudflare/types/logpush/datasets/__init__.py +++ b/src/cloudflare/types/logpush/datasets/__init__.py @@ -2,7 +2,4 @@ from __future__ import annotations -from .job import Job as Job -from .output_options import OutputOptions as OutputOptions from .job_get_response import JobGetResponse as JobGetResponse -from .output_options_param import OutputOptionsParam as OutputOptionsParam diff --git a/src/cloudflare/types/logpush/datasets/job_get_response.py b/src/cloudflare/types/logpush/datasets/job_get_response.py index 724885d6613..6282a6c3169 100644 --- a/src/cloudflare/types/logpush/datasets/job_get_response.py +++ b/src/cloudflare/types/logpush/datasets/job_get_response.py @@ -1,9 +1,85 @@ # 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 .job import Job +from ...._models import BaseModel +from ..output_options import OutputOptions -__all__ = ["JobGetResponse"] +__all__ = ["JobGetResponse", "JobGetResponseItem"] -JobGetResponse = List[Optional[Job]] + +class JobGetResponseItem(BaseModel): + id: Optional[int] = None + """Unique id of the job.""" + + dataset: Optional[str] = None + """Name of the dataset.""" + + destination_conf: Optional[str] = None + """Uniquely identifies a resource (such as an s3 bucket) where data will be pushed. + + Additional configuration parameters supported by the destination may be + included. + """ + + enabled: Optional[bool] = None + """Flag that indicates if the job is enabled.""" + + error_message: Optional[datetime] = None + """If not null, the job is currently failing. + + Failures are usually repetitive (example: no permissions to write to destination + bucket). Only the last failure is recorded. On successful execution of a job the + error_message and last_error are set to null. + """ + + frequency: Optional[Literal["high", "low"]] = None + """The frequency at which Cloudflare sends batches of logs to your destination. + + Setting frequency to high sends your logs in larger quantities of smaller files. + Setting frequency to low sends logs in smaller quantities of larger files. + """ + + last_complete: Optional[datetime] = None + """Records the last time for which logs have been successfully pushed. + + If the last successful push was for logs range 2018-07-23T10:00:00Z to + 2018-07-23T10:01:00Z then the value of this field will be 2018-07-23T10:01:00Z. + If the job has never run or has just been enabled and hasn't run yet then the + field will be empty. + """ + + last_error: Optional[datetime] = None + """Records the last time the job failed. + + If not null, the job is currently failing. If null, the job has either never + failed or has run successfully at least once since last failure. See also the + error_message field. + """ + + logpull_options: Optional[str] = None + """This field is deprecated. + + Use `output_options` instead. Configuration string. It specifies things like + requested fields and timestamp formats. If migrating from the logpull api, copy + the url (full url or just the query string) of your call here, and logpush will + keep on making this call for you, setting start and end times appropriately. + """ + + name: Optional[str] = None + """Optional human readable job name. + + Not unique. Cloudflare suggests that you set this to a meaningful string, like + the domain name, to make it easier to identify your job. + """ + + output_options: Optional[OutputOptions] = None + """The structured replacement for `logpull_options`. + + When including this field, the `logpull_option` field will be ignored. + """ + + +JobGetResponse = List[Optional[JobGetResponseItem]] diff --git a/src/cloudflare/types/logpush/job_create_params.py b/src/cloudflare/types/logpush/job_create_params.py index aaad5e5c974..39f9ecca17d 100644 --- a/src/cloudflare/types/logpush/job_create_params.py +++ b/src/cloudflare/types/logpush/job_create_params.py @@ -5,7 +5,7 @@ from typing import Optional from typing_extensions import Literal, Required, TypedDict -from .datasets import OutputOptionsParam +from .output_options_param import OutputOptionsParam __all__ = ["JobCreateParams"] diff --git a/src/cloudflare/types/logpush/job_create_response.py b/src/cloudflare/types/logpush/job_create_response.py new file mode 100644 index 00000000000..59ddaf3fb60 --- /dev/null +++ b/src/cloudflare/types/logpush/job_create_response.py @@ -0,0 +1,82 @@ +# 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 +from .output_options import OutputOptions + +__all__ = ["JobCreateResponse"] + + +class JobCreateResponse(BaseModel): + id: Optional[int] = None + """Unique id of the job.""" + + dataset: Optional[str] = None + """Name of the dataset.""" + + destination_conf: Optional[str] = None + """Uniquely identifies a resource (such as an s3 bucket) where data will be pushed. + + Additional configuration parameters supported by the destination may be + included. + """ + + enabled: Optional[bool] = None + """Flag that indicates if the job is enabled.""" + + error_message: Optional[datetime] = None + """If not null, the job is currently failing. + + Failures are usually repetitive (example: no permissions to write to destination + bucket). Only the last failure is recorded. On successful execution of a job the + error_message and last_error are set to null. + """ + + frequency: Optional[Literal["high", "low"]] = None + """The frequency at which Cloudflare sends batches of logs to your destination. + + Setting frequency to high sends your logs in larger quantities of smaller files. + Setting frequency to low sends logs in smaller quantities of larger files. + """ + + last_complete: Optional[datetime] = None + """Records the last time for which logs have been successfully pushed. + + If the last successful push was for logs range 2018-07-23T10:00:00Z to + 2018-07-23T10:01:00Z then the value of this field will be 2018-07-23T10:01:00Z. + If the job has never run or has just been enabled and hasn't run yet then the + field will be empty. + """ + + last_error: Optional[datetime] = None + """Records the last time the job failed. + + If not null, the job is currently failing. If null, the job has either never + failed or has run successfully at least once since last failure. See also the + error_message field. + """ + + logpull_options: Optional[str] = None + """This field is deprecated. + + Use `output_options` instead. Configuration string. It specifies things like + requested fields and timestamp formats. If migrating from the logpull api, copy + the url (full url or just the query string) of your call here, and logpush will + keep on making this call for you, setting start and end times appropriately. + """ + + name: Optional[str] = None + """Optional human readable job name. + + Not unique. Cloudflare suggests that you set this to a meaningful string, like + the domain name, to make it easier to identify your job. + """ + + output_options: Optional[OutputOptions] = None + """The structured replacement for `logpull_options`. + + When including this field, the `logpull_option` field will be ignored. + """ diff --git a/src/cloudflare/types/logpush/datasets/job.py b/src/cloudflare/types/logpush/job_get_response.py similarity index 96% rename from src/cloudflare/types/logpush/datasets/job.py rename to src/cloudflare/types/logpush/job_get_response.py index 733f0a2792a..d89f119fd84 100644 --- a/src/cloudflare/types/logpush/datasets/job.py +++ b/src/cloudflare/types/logpush/job_get_response.py @@ -4,13 +4,13 @@ from datetime import datetime from typing_extensions import Literal -from ...._models import BaseModel +from ..._models import BaseModel from .output_options import OutputOptions -__all__ = ["Job"] +__all__ = ["JobGetResponse"] -class Job(BaseModel): +class JobGetResponse(BaseModel): id: Optional[int] = None """Unique id of the job.""" diff --git a/src/cloudflare/types/logpush/job_list_response.py b/src/cloudflare/types/logpush/job_list_response.py new file mode 100644 index 00000000000..42361aac6a8 --- /dev/null +++ b/src/cloudflare/types/logpush/job_list_response.py @@ -0,0 +1,82 @@ +# 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 +from .output_options import OutputOptions + +__all__ = ["JobListResponse"] + + +class JobListResponse(BaseModel): + id: Optional[int] = None + """Unique id of the job.""" + + dataset: Optional[str] = None + """Name of the dataset.""" + + destination_conf: Optional[str] = None + """Uniquely identifies a resource (such as an s3 bucket) where data will be pushed. + + Additional configuration parameters supported by the destination may be + included. + """ + + enabled: Optional[bool] = None + """Flag that indicates if the job is enabled.""" + + error_message: Optional[datetime] = None + """If not null, the job is currently failing. + + Failures are usually repetitive (example: no permissions to write to destination + bucket). Only the last failure is recorded. On successful execution of a job the + error_message and last_error are set to null. + """ + + frequency: Optional[Literal["high", "low"]] = None + """The frequency at which Cloudflare sends batches of logs to your destination. + + Setting frequency to high sends your logs in larger quantities of smaller files. + Setting frequency to low sends logs in smaller quantities of larger files. + """ + + last_complete: Optional[datetime] = None + """Records the last time for which logs have been successfully pushed. + + If the last successful push was for logs range 2018-07-23T10:00:00Z to + 2018-07-23T10:01:00Z then the value of this field will be 2018-07-23T10:01:00Z. + If the job has never run or has just been enabled and hasn't run yet then the + field will be empty. + """ + + last_error: Optional[datetime] = None + """Records the last time the job failed. + + If not null, the job is currently failing. If null, the job has either never + failed or has run successfully at least once since last failure. See also the + error_message field. + """ + + logpull_options: Optional[str] = None + """This field is deprecated. + + Use `output_options` instead. Configuration string. It specifies things like + requested fields and timestamp formats. If migrating from the logpull api, copy + the url (full url or just the query string) of your call here, and logpush will + keep on making this call for you, setting start and end times appropriately. + """ + + name: Optional[str] = None + """Optional human readable job name. + + Not unique. Cloudflare suggests that you set this to a meaningful string, like + the domain name, to make it easier to identify your job. + """ + + output_options: Optional[OutputOptions] = None + """The structured replacement for `logpull_options`. + + When including this field, the `logpull_option` field will be ignored. + """ diff --git a/src/cloudflare/types/logpush/job_update_params.py b/src/cloudflare/types/logpush/job_update_params.py index 1b63d27ee3a..4246f9d3521 100644 --- a/src/cloudflare/types/logpush/job_update_params.py +++ b/src/cloudflare/types/logpush/job_update_params.py @@ -5,7 +5,7 @@ from typing import Optional from typing_extensions import Literal, TypedDict -from .datasets import OutputOptionsParam +from .output_options_param import OutputOptionsParam __all__ = ["JobUpdateParams"] diff --git a/src/cloudflare/types/logpush/job_update_response.py b/src/cloudflare/types/logpush/job_update_response.py new file mode 100644 index 00000000000..8d9b7b631a1 --- /dev/null +++ b/src/cloudflare/types/logpush/job_update_response.py @@ -0,0 +1,82 @@ +# 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 +from .output_options import OutputOptions + +__all__ = ["JobUpdateResponse"] + + +class JobUpdateResponse(BaseModel): + id: Optional[int] = None + """Unique id of the job.""" + + dataset: Optional[str] = None + """Name of the dataset.""" + + destination_conf: Optional[str] = None + """Uniquely identifies a resource (such as an s3 bucket) where data will be pushed. + + Additional configuration parameters supported by the destination may be + included. + """ + + enabled: Optional[bool] = None + """Flag that indicates if the job is enabled.""" + + error_message: Optional[datetime] = None + """If not null, the job is currently failing. + + Failures are usually repetitive (example: no permissions to write to destination + bucket). Only the last failure is recorded. On successful execution of a job the + error_message and last_error are set to null. + """ + + frequency: Optional[Literal["high", "low"]] = None + """The frequency at which Cloudflare sends batches of logs to your destination. + + Setting frequency to high sends your logs in larger quantities of smaller files. + Setting frequency to low sends logs in smaller quantities of larger files. + """ + + last_complete: Optional[datetime] = None + """Records the last time for which logs have been successfully pushed. + + If the last successful push was for logs range 2018-07-23T10:00:00Z to + 2018-07-23T10:01:00Z then the value of this field will be 2018-07-23T10:01:00Z. + If the job has never run or has just been enabled and hasn't run yet then the + field will be empty. + """ + + last_error: Optional[datetime] = None + """Records the last time the job failed. + + If not null, the job is currently failing. If null, the job has either never + failed or has run successfully at least once since last failure. See also the + error_message field. + """ + + logpull_options: Optional[str] = None + """This field is deprecated. + + Use `output_options` instead. Configuration string. It specifies things like + requested fields and timestamp formats. If migrating from the logpull api, copy + the url (full url or just the query string) of your call here, and logpush will + keep on making this call for you, setting start and end times appropriately. + """ + + name: Optional[str] = None + """Optional human readable job name. + + Not unique. Cloudflare suggests that you set this to a meaningful string, like + the domain name, to make it easier to identify your job. + """ + + output_options: Optional[OutputOptions] = None + """The structured replacement for `logpull_options`. + + When including this field, the `logpull_option` field will be ignored. + """ diff --git a/src/cloudflare/types/logpush/datasets/output_options.py b/src/cloudflare/types/logpush/output_options.py similarity index 98% rename from src/cloudflare/types/logpush/datasets/output_options.py rename to src/cloudflare/types/logpush/output_options.py index 8566e753792..6cd72a01e72 100644 --- a/src/cloudflare/types/logpush/datasets/output_options.py +++ b/src/cloudflare/types/logpush/output_options.py @@ -5,7 +5,7 @@ from pydantic import Field as FieldInfo -from ...._models import BaseModel +from ..._models import BaseModel __all__ = ["OutputOptions"] diff --git a/src/cloudflare/types/logpush/datasets/output_options_param.py b/src/cloudflare/types/logpush/output_options_param.py similarity index 98% rename from src/cloudflare/types/logpush/datasets/output_options_param.py rename to src/cloudflare/types/logpush/output_options_param.py index 0457065c404..78e97b57a74 100644 --- a/src/cloudflare/types/logpush/datasets/output_options_param.py +++ b/src/cloudflare/types/logpush/output_options_param.py @@ -5,7 +5,7 @@ from typing import List, Optional from typing_extensions import Literal, Annotated, TypedDict -from ...._utils import PropertyInfo +from ..._utils import PropertyInfo __all__ = ["OutputOptionsParam"] diff --git a/src/cloudflare/types/magic_transit/sites/__init__.py b/src/cloudflare/types/magic_transit/sites/__init__.py index d38c3edc689..6809949d08d 100644 --- a/src/cloudflare/types/magic_transit/sites/__init__.py +++ b/src/cloudflare/types/magic_transit/sites/__init__.py @@ -13,6 +13,7 @@ from .subnet_param import SubnetParam as SubnetParam from .routed_subnet import RoutedSubnet as RoutedSubnet from .acl_get_response import ACLGetResponse as ACLGetResponse +from .allowed_protocol import AllowedProtocol as AllowedProtocol from .dhcp_relay_param import DHCPRelayParam as DHCPRelayParam from .lan_get_response import LANGetResponse as LANGetResponse from .wan_get_response import WANGetResponse as WANGetResponse @@ -45,6 +46,3 @@ from .acl_configuration_param import ACLConfigurationParam as ACLConfigurationParam from .lan_static_addressing_param import LANStaticAddressingParam as LANStaticAddressingParam from .wan_static_addressing_param import WANStaticAddressingParam as WANStaticAddressingParam -from .unnamed_schema_ref_87fa9e5fe9f6b8d607be1df57340d916 import ( - UnnamedSchemaRef87fa9e5fe9f6b8d607be1df57340d916 as UnnamedSchemaRef87fa9e5fe9f6b8d607be1df57340d916, -) diff --git a/src/cloudflare/types/magic_transit/sites/acl.py b/src/cloudflare/types/magic_transit/sites/acl.py index 4c678220ffc..01bcf9e4b55 100644 --- a/src/cloudflare/types/magic_transit/sites/acl.py +++ b/src/cloudflare/types/magic_transit/sites/acl.py @@ -3,8 +3,8 @@ from typing import List, Optional from ...._models import BaseModel +from .allowed_protocol import AllowedProtocol from .acl_configuration import ACLConfiguration -from .unnamed_schema_ref_87fa9e5fe9f6b8d607be1df57340d916 import UnnamedSchemaRef87fa9e5fe9f6b8d607be1df57340d916 __all__ = ["ACL"] @@ -31,4 +31,4 @@ class ACL(BaseModel): name: Optional[str] = None """The name of the ACL.""" - protocols: Optional[List[UnnamedSchemaRef87fa9e5fe9f6b8d607be1df57340d916]] = None + protocols: Optional[List[AllowedProtocol]] = None diff --git a/src/cloudflare/types/magic_transit/sites/acl_create_params.py b/src/cloudflare/types/magic_transit/sites/acl_create_params.py index 44ce0d3e586..ae1176846f2 100644 --- a/src/cloudflare/types/magic_transit/sites/acl_create_params.py +++ b/src/cloudflare/types/magic_transit/sites/acl_create_params.py @@ -5,8 +5,8 @@ from typing import List from typing_extensions import Required, TypedDict +from .allowed_protocol import AllowedProtocol from .acl_configuration_param import ACLConfigurationParam -from .unnamed_schema_ref_87fa9e5fe9f6b8d607be1df57340d916 import UnnamedSchemaRef87fa9e5fe9f6b8d607be1df57340d916 __all__ = ["ACLCreateParams", "ACL"] @@ -37,4 +37,4 @@ class ACL(TypedDict, total=False): not included in request, will default to false. """ - protocols: List[UnnamedSchemaRef87fa9e5fe9f6b8d607be1df57340d916] + protocols: List[AllowedProtocol] diff --git a/src/cloudflare/types/magic_transit/sites/acl_update_params.py b/src/cloudflare/types/magic_transit/sites/acl_update_params.py index 3cc5d19192a..d875fc1d23f 100644 --- a/src/cloudflare/types/magic_transit/sites/acl_update_params.py +++ b/src/cloudflare/types/magic_transit/sites/acl_update_params.py @@ -5,8 +5,8 @@ from typing import List from typing_extensions import Required, TypedDict +from .allowed_protocol import AllowedProtocol from .acl_configuration_param import ACLConfigurationParam -from .unnamed_schema_ref_87fa9e5fe9f6b8d607be1df57340d916 import UnnamedSchemaRef87fa9e5fe9f6b8d607be1df57340d916 __all__ = ["ACLUpdateParams", "ACL"] @@ -40,4 +40,4 @@ class ACL(TypedDict, total=False): name: str """The name of the ACL.""" - protocols: List[UnnamedSchemaRef87fa9e5fe9f6b8d607be1df57340d916] + protocols: List[AllowedProtocol] diff --git a/src/cloudflare/types/magic_transit/sites/allowed_protocol.py b/src/cloudflare/types/magic_transit/sites/allowed_protocol.py new file mode 100644 index 00000000000..cce3a21021e --- /dev/null +++ b/src/cloudflare/types/magic_transit/sites/allowed_protocol.py @@ -0,0 +1,7 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing_extensions import Literal + +__all__ = ["AllowedProtocol"] + +AllowedProtocol = Literal["tcp", "udp", "icmp"] diff --git a/src/cloudflare/types/magic_transit/sites/unnamed_schema_ref_87fa9e5fe9f6b8d607be1df57340d916.py b/src/cloudflare/types/magic_transit/sites/unnamed_schema_ref_87fa9e5fe9f6b8d607be1df57340d916.py deleted file mode 100644 index 33bf659a4c3..00000000000 --- a/src/cloudflare/types/magic_transit/sites/unnamed_schema_ref_87fa9e5fe9f6b8d607be1df57340d916.py +++ /dev/null @@ -1,7 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing_extensions import Literal - -__all__ = ["UnnamedSchemaRef87fa9e5fe9f6b8d607be1df57340d916"] - -UnnamedSchemaRef87fa9e5fe9f6b8d607be1df57340d916 = Literal["tcp", "udp", "icmp"] diff --git a/src/cloudflare/types/origin_tls_client_auth/hostnames/__init__.py b/src/cloudflare/types/origin_tls_client_auth/hostnames/__init__.py index c10ec3bd2a1..e8930167334 100644 --- a/src/cloudflare/types/origin_tls_client_auth/hostnames/__init__.py +++ b/src/cloudflare/types/origin_tls_client_auth/hostnames/__init__.py @@ -3,5 +3,8 @@ from __future__ import annotations from .certificate import Certificate as Certificate +from .certificate_get_response import CertificateGetResponse as CertificateGetResponse from .certificate_create_params import CertificateCreateParams as CertificateCreateParams from .certificate_delete_params import CertificateDeleteParams as CertificateDeleteParams +from .certificate_create_response import CertificateCreateResponse as CertificateCreateResponse +from .certificate_delete_response import CertificateDeleteResponse as CertificateDeleteResponse diff --git a/src/cloudflare/types/origin_tls_client_auth/hostnames/certificate_create_response.py b/src/cloudflare/types/origin_tls_client_auth/hostnames/certificate_create_response.py new file mode 100644 index 00000000000..a841654f3c3 --- /dev/null +++ b/src/cloudflare/types/origin_tls_client_auth/hostnames/certificate_create_response.py @@ -0,0 +1,45 @@ +# 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__ = ["CertificateCreateResponse"] + + +class CertificateCreateResponse(BaseModel): + id: Optional[str] = None + """Identifier""" + + certificate: Optional[str] = None + """The hostname certificate.""" + + expires_on: Optional[datetime] = None + """The date when the certificate expires.""" + + issuer: Optional[str] = None + """The certificate authority that issued the certificate.""" + + serial_number: Optional[str] = None + """The serial number on the uploaded certificate.""" + + signature: Optional[str] = None + """The type of hash used for the certificate.""" + + status: Optional[ + Literal[ + "initializing", + "pending_deployment", + "pending_deletion", + "active", + "deleted", + "deployment_timed_out", + "deletion_timed_out", + ] + ] = None + """Status of the certificate or the association.""" + + uploaded_on: Optional[datetime] = None + """The time when the certificate was uploaded.""" diff --git a/src/cloudflare/types/origin_tls_client_auth/hostnames/certificate_delete_response.py b/src/cloudflare/types/origin_tls_client_auth/hostnames/certificate_delete_response.py new file mode 100644 index 00000000000..2cd196b82e6 --- /dev/null +++ b/src/cloudflare/types/origin_tls_client_auth/hostnames/certificate_delete_response.py @@ -0,0 +1,45 @@ +# 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__ = ["CertificateDeleteResponse"] + + +class CertificateDeleteResponse(BaseModel): + id: Optional[str] = None + """Identifier""" + + certificate: Optional[str] = None + """The hostname certificate.""" + + expires_on: Optional[datetime] = None + """The date when the certificate expires.""" + + issuer: Optional[str] = None + """The certificate authority that issued the certificate.""" + + serial_number: Optional[str] = None + """The serial number on the uploaded certificate.""" + + signature: Optional[str] = None + """The type of hash used for the certificate.""" + + status: Optional[ + Literal[ + "initializing", + "pending_deployment", + "pending_deletion", + "active", + "deleted", + "deployment_timed_out", + "deletion_timed_out", + ] + ] = None + """Status of the certificate or the association.""" + + uploaded_on: Optional[datetime] = None + """The time when the certificate was uploaded.""" diff --git a/src/cloudflare/types/origin_tls_client_auth/hostnames/certificate_get_response.py b/src/cloudflare/types/origin_tls_client_auth/hostnames/certificate_get_response.py new file mode 100644 index 00000000000..3f5da2edf1f --- /dev/null +++ b/src/cloudflare/types/origin_tls_client_auth/hostnames/certificate_get_response.py @@ -0,0 +1,45 @@ +# 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__ = ["CertificateGetResponse"] + + +class CertificateGetResponse(BaseModel): + id: Optional[str] = None + """Identifier""" + + certificate: Optional[str] = None + """The hostname certificate.""" + + expires_on: Optional[datetime] = None + """The date when the certificate expires.""" + + issuer: Optional[str] = None + """The certificate authority that issued the certificate.""" + + serial_number: Optional[str] = None + """The serial number on the uploaded certificate.""" + + signature: Optional[str] = None + """The type of hash used for the certificate.""" + + status: Optional[ + Literal[ + "initializing", + "pending_deployment", + "pending_deletion", + "active", + "deleted", + "deployment_timed_out", + "deletion_timed_out", + ] + ] = None + """Status of the certificate or the association.""" + + uploaded_on: Optional[datetime] = None + """The time when the certificate was uploaded.""" diff --git a/src/cloudflare/types/queues/__init__.py b/src/cloudflare/types/queues/__init__.py index ef24e820fb8..fa5698295b9 100644 --- a/src/cloudflare/types/queues/__init__.py +++ b/src/cloudflare/types/queues/__init__.py @@ -13,6 +13,3 @@ from .consumer_create_response import ConsumerCreateResponse as ConsumerCreateResponse from .consumer_delete_response import ConsumerDeleteResponse as ConsumerDeleteResponse from .consumer_update_response import ConsumerUpdateResponse as ConsumerUpdateResponse -from .unnamed_schema_ref_fbd3a4642487e41594e9af0ccb9a5ca5 import ( - UnnamedSchemaRefFbd3a4642487e41594e9af0ccb9a5ca5 as UnnamedSchemaRefFbd3a4642487e41594e9af0ccb9a5ca5, -) diff --git a/src/cloudflare/types/queues/consumer_create_response.py b/src/cloudflare/types/queues/consumer_create_response.py index e613adf94c4..14efd41f1da 100644 --- a/src/cloudflare/types/queues/consumer_create_response.py +++ b/src/cloudflare/types/queues/consumer_create_response.py @@ -3,9 +3,17 @@ from typing import Optional from ..._models import BaseModel -from .unnamed_schema_ref_fbd3a4642487e41594e9af0ccb9a5ca5 import UnnamedSchemaRefFbd3a4642487e41594e9af0ccb9a5ca5 -__all__ = ["ConsumerCreateResponse"] +__all__ = ["ConsumerCreateResponse", "Settings"] + + +class Settings(BaseModel): + batch_size: Optional[float] = None + """The maximum number of messages to include in a batch""" + + max_retries: Optional[float] = None + + max_wait_time_ms: Optional[float] = None class ConsumerCreateResponse(BaseModel): @@ -19,4 +27,4 @@ class ConsumerCreateResponse(BaseModel): script_name: Optional[object] = None - settings: Optional[UnnamedSchemaRefFbd3a4642487e41594e9af0ccb9a5ca5] = None + settings: Optional[Settings] = None diff --git a/src/cloudflare/types/queues/consumer_get_response.py b/src/cloudflare/types/queues/consumer_get_response.py index c4e98fa770d..8a00b17a127 100644 --- a/src/cloudflare/types/queues/consumer_get_response.py +++ b/src/cloudflare/types/queues/consumer_get_response.py @@ -3,9 +3,17 @@ from typing import List, Optional from ..._models import BaseModel -from .unnamed_schema_ref_fbd3a4642487e41594e9af0ccb9a5ca5 import UnnamedSchemaRefFbd3a4642487e41594e9af0ccb9a5ca5 -__all__ = ["ConsumerGetResponse", "ConsumerGetResponseItem"] +__all__ = ["ConsumerGetResponse", "ConsumerGetResponseItem", "ConsumerGetResponseItemSettings"] + + +class ConsumerGetResponseItemSettings(BaseModel): + batch_size: Optional[float] = None + """The maximum number of messages to include in a batch""" + + max_retries: Optional[float] = None + + max_wait_time_ms: Optional[float] = None class ConsumerGetResponseItem(BaseModel): @@ -17,7 +25,7 @@ class ConsumerGetResponseItem(BaseModel): service: Optional[object] = None - settings: Optional[UnnamedSchemaRefFbd3a4642487e41594e9af0ccb9a5ca5] = None + settings: Optional[ConsumerGetResponseItemSettings] = None ConsumerGetResponse = List[ConsumerGetResponseItem] diff --git a/src/cloudflare/types/queues/unnamed_schema_ref_fbd3a4642487e41594e9af0ccb9a5ca5.py b/src/cloudflare/types/queues/unnamed_schema_ref_fbd3a4642487e41594e9af0ccb9a5ca5.py deleted file mode 100644 index 9abe81e3804..00000000000 --- a/src/cloudflare/types/queues/unnamed_schema_ref_fbd3a4642487e41594e9af0ccb9a5ca5.py +++ /dev/null @@ -1,16 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing import Optional - -from ..._models import BaseModel - -__all__ = ["UnnamedSchemaRefFbd3a4642487e41594e9af0ccb9a5ca5"] - - -class UnnamedSchemaRefFbd3a4642487e41594e9af0ccb9a5ca5(BaseModel): - batch_size: Optional[float] = None - """The maximum number of messages to include in a batch""" - - max_retries: Optional[float] = None - - max_wait_time_ms: Optional[float] = None diff --git a/src/cloudflare/types/unnamed_schema_ref_3e10ea08deb8102a27500f986488c1e8.py b/src/cloudflare/types/rule_match.py similarity index 77% rename from src/cloudflare/types/unnamed_schema_ref_3e10ea08deb8102a27500f986488c1e8.py rename to src/cloudflare/types/rule_match.py index 6602bfe45d5..273241cf233 100644 --- a/src/cloudflare/types/unnamed_schema_ref_3e10ea08deb8102a27500f986488c1e8.py +++ b/src/cloudflare/types/rule_match.py @@ -4,10 +4,10 @@ from .._models import BaseModel -__all__ = ["UnnamedSchemaRef3e10ea08deb8102a27500f986488c1e8"] +__all__ = ["RuleMatch"] -class UnnamedSchemaRef3e10ea08deb8102a27500f986488c1e8(BaseModel): +class RuleMatch(BaseModel): banning: Optional[bool] = None """For internal use.""" diff --git a/src/cloudflare/types/unnamed_schema_ref_a64e2a18a86750b6bd72cdf37ecfd869.py b/src/cloudflare/types/scan_status.py similarity index 80% rename from src/cloudflare/types/unnamed_schema_ref_a64e2a18a86750b6bd72cdf37ecfd869.py rename to src/cloudflare/types/scan_status.py index d9a521b986f..ddd530e9067 100644 --- a/src/cloudflare/types/unnamed_schema_ref_a64e2a18a86750b6bd72cdf37ecfd869.py +++ b/src/cloudflare/types/scan_status.py @@ -4,10 +4,10 @@ from .._models import BaseModel -__all__ = ["UnnamedSchemaRefA64e2a18a86750b6bd72cdf37ecfd869"] +__all__ = ["ScanStatus"] -class UnnamedSchemaRefA64e2a18a86750b6bd72cdf37ecfd869(BaseModel): +class ScanStatus(BaseModel): last_processed: Optional[str] = None """Timestamp of when the submission was processed.""" diff --git a/src/cloudflare/types/secondary_dns/__init__.py b/src/cloudflare/types/secondary_dns/__init__.py index 72716c6630b..6617ed08977 100644 --- a/src/cloudflare/types/secondary_dns/__init__.py +++ b/src/cloudflare/types/secondary_dns/__init__.py @@ -3,7 +3,6 @@ from __future__ import annotations from .acl import ACL as ACL -from .peer import Peer as Peer from .tsig import TSIG as TSIG from .force_axfr import ForceAXFR as ForceAXFR from .enable_transfer import EnableTransfer as EnableTransfer @@ -12,14 +11,18 @@ from .acl_create_params import ACLCreateParams as ACLCreateParams from .acl_delete_params import ACLDeleteParams as ACLDeleteParams from .acl_update_params import ACLUpdateParams as ACLUpdateParams +from .peer_get_response import PeerGetResponse as PeerGetResponse from .peer_create_params import PeerCreateParams as PeerCreateParams from .peer_delete_params import PeerDeleteParams as PeerDeleteParams +from .peer_list_response import PeerListResponse as PeerListResponse from .peer_update_params import PeerUpdateParams as PeerUpdateParams from .tsig_create_params import TSIGCreateParams as TSIGCreateParams from .tsig_delete_params import TSIGDeleteParams as TSIGDeleteParams from .tsig_update_params import TSIGUpdateParams as TSIGUpdateParams from .acl_delete_response import ACLDeleteResponse as ACLDeleteResponse +from .peer_create_response import PeerCreateResponse as PeerCreateResponse from .peer_delete_response import PeerDeleteResponse as PeerDeleteResponse +from .peer_update_response import PeerUpdateResponse as PeerUpdateResponse from .tsig_delete_response import TSIGDeleteResponse as TSIGDeleteResponse from .incoming_get_response import IncomingGetResponse as IncomingGetResponse from .outgoing_get_response import OutgoingGetResponse as OutgoingGetResponse diff --git a/src/cloudflare/types/secondary_dns/outgoing/__init__.py b/src/cloudflare/types/secondary_dns/outgoing/__init__.py index f8ee8b14b1c..78d1ff6c78f 100644 --- a/src/cloudflare/types/secondary_dns/outgoing/__init__.py +++ b/src/cloudflare/types/secondary_dns/outgoing/__init__.py @@ -1,3 +1,5 @@ # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. from __future__ import annotations + +from .outgoing import Outgoing as Outgoing diff --git a/src/cloudflare/types/secondary_dns/outgoing/outgoing.py b/src/cloudflare/types/secondary_dns/outgoing/outgoing.py new file mode 100644 index 00000000000..59d9ef2378b --- /dev/null +++ b/src/cloudflare/types/secondary_dns/outgoing/outgoing.py @@ -0,0 +1,29 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import List, Optional + +from ...._models import BaseModel + +__all__ = ["Outgoing"] + + +class Outgoing(BaseModel): + id: Optional[str] = None + + checked_time: Optional[str] = None + """The time for a specific event.""" + + created_time: Optional[str] = None + """The time for a specific event.""" + + last_transferred_time: Optional[str] = None + """The time for a specific event.""" + + name: Optional[str] = None + """Zone name.""" + + peers: Optional[List[object]] = None + """A list of peer tags.""" + + soa_serial: Optional[float] = None + """The serial number of the SOA for the given zone.""" diff --git a/src/cloudflare/types/secondary_dns/peer_create_response.py b/src/cloudflare/types/secondary_dns/peer_create_response.py new file mode 100644 index 00000000000..b793a770ba2 --- /dev/null +++ b/src/cloudflare/types/secondary_dns/peer_create_response.py @@ -0,0 +1,38 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import Optional + +from ..._models import BaseModel + +__all__ = ["PeerCreateResponse"] + + +class PeerCreateResponse(BaseModel): + id: str + + name: str + """The name of the peer.""" + + ip: Optional[str] = None + """ + IPv4/IPv6 address of primary or secondary nameserver, depending on what zone + this peer is linked to. For primary zones this IP defines the IP of the + secondary nameserver Cloudflare will NOTIFY upon zone changes. For secondary + zones this IP defines the IP of the primary nameserver Cloudflare will send + AXFR/IXFR requests to. + """ + + ixfr_enable: Optional[bool] = None + """Enable IXFR transfer protocol, default is AXFR. + + Only applicable to secondary zones. + """ + + port: Optional[float] = None + """ + DNS port of primary or secondary nameserver, depending on what zone this peer is + linked to. + """ + + tsig_id: Optional[str] = None + """TSIG authentication will be used for zone transfer if configured.""" diff --git a/src/cloudflare/types/secondary_dns/peer.py b/src/cloudflare/types/secondary_dns/peer_get_response.py similarity index 94% rename from src/cloudflare/types/secondary_dns/peer.py rename to src/cloudflare/types/secondary_dns/peer_get_response.py index 502be2d220f..0ed79690966 100644 --- a/src/cloudflare/types/secondary_dns/peer.py +++ b/src/cloudflare/types/secondary_dns/peer_get_response.py @@ -4,10 +4,10 @@ from ..._models import BaseModel -__all__ = ["Peer"] +__all__ = ["PeerGetResponse"] -class Peer(BaseModel): +class PeerGetResponse(BaseModel): id: str name: str diff --git a/src/cloudflare/types/secondary_dns/peer_list_response.py b/src/cloudflare/types/secondary_dns/peer_list_response.py new file mode 100644 index 00000000000..89a0d78d331 --- /dev/null +++ b/src/cloudflare/types/secondary_dns/peer_list_response.py @@ -0,0 +1,38 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import Optional + +from ..._models import BaseModel + +__all__ = ["PeerListResponse"] + + +class PeerListResponse(BaseModel): + id: str + + name: str + """The name of the peer.""" + + ip: Optional[str] = None + """ + IPv4/IPv6 address of primary or secondary nameserver, depending on what zone + this peer is linked to. For primary zones this IP defines the IP of the + secondary nameserver Cloudflare will NOTIFY upon zone changes. For secondary + zones this IP defines the IP of the primary nameserver Cloudflare will send + AXFR/IXFR requests to. + """ + + ixfr_enable: Optional[bool] = None + """Enable IXFR transfer protocol, default is AXFR. + + Only applicable to secondary zones. + """ + + port: Optional[float] = None + """ + DNS port of primary or secondary nameserver, depending on what zone this peer is + linked to. + """ + + tsig_id: Optional[str] = None + """TSIG authentication will be used for zone transfer if configured.""" diff --git a/src/cloudflare/types/secondary_dns/peer_update_response.py b/src/cloudflare/types/secondary_dns/peer_update_response.py new file mode 100644 index 00000000000..03c711bf653 --- /dev/null +++ b/src/cloudflare/types/secondary_dns/peer_update_response.py @@ -0,0 +1,38 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import Optional + +from ..._models import BaseModel + +__all__ = ["PeerUpdateResponse"] + + +class PeerUpdateResponse(BaseModel): + id: str + + name: str + """The name of the peer.""" + + ip: Optional[str] = None + """ + IPv4/IPv6 address of primary or secondary nameserver, depending on what zone + this peer is linked to. For primary zones this IP defines the IP of the + secondary nameserver Cloudflare will NOTIFY upon zone changes. For secondary + zones this IP defines the IP of the primary nameserver Cloudflare will send + AXFR/IXFR requests to. + """ + + ixfr_enable: Optional[bool] = None + """Enable IXFR transfer protocol, default is AXFR. + + Only applicable to secondary zones. + """ + + port: Optional[float] = None + """ + DNS port of primary or secondary nameserver, depending on what zone this peer is + linked to. + """ + + tsig_id: Optional[str] = None + """TSIG authentication will be used for zone transfer if configured.""" diff --git a/src/cloudflare/types/submit.py b/src/cloudflare/types/submit.py index 31aecae76b2..d053919f1ef 100644 --- a/src/cloudflare/types/submit.py +++ b/src/cloudflare/types/submit.py @@ -3,22 +3,40 @@ from typing import List, Optional from .._models import BaseModel -from .unnamed_schema_ref_44e66100b948bfe723054c56b6144766 import UnnamedSchemaRef44e66100b948bfe723054c56b6144766 -from .unnamed_schema_ref_767c0981cf47f45f0c766253dbd18669 import UnnamedSchemaRef767c0981cf47f45f0c766253dbd18669 -from .unnamed_schema_ref_39419d70e2399b28b15cd660afd342fb import UnnamedSchemaRef39419d70e2399b28b15cd660afd342fb -__all__ = ["Submit"] +__all__ = ["Submit", "ExcludedURL", "SkippedURL", "SubmittedURL"] + + +class ExcludedURL(BaseModel): + url: Optional[str] = None + """URL that was excluded.""" + + +class SkippedURL(BaseModel): + url: Optional[str] = None + """URL that was skipped.""" + + url_id: Optional[int] = None + """ID of the submission of that URL that is currently scanning.""" + + +class SubmittedURL(BaseModel): + url: Optional[str] = None + """URL that was submitted.""" + + url_id: Optional[int] = None + """ID assigned to this URL submission. Used to retrieve scanning results.""" class Submit(BaseModel): - excluded_urls: Optional[List[UnnamedSchemaRef767c0981cf47f45f0c766253dbd18669]] = None + excluded_urls: Optional[List[ExcludedURL]] = None """ URLs that were excluded from scanning because their domain is in our no-scan list. """ - skipped_urls: Optional[List[UnnamedSchemaRef44e66100b948bfe723054c56b6144766]] = None + skipped_urls: Optional[List[SkippedURL]] = None """URLs that were skipped because the same URL is currently being scanned""" - submitted_urls: Optional[List[UnnamedSchemaRef39419d70e2399b28b15cd660afd342fb]] = None + submitted_urls: Optional[List[SubmittedURL]] = None """URLs that were successfully submitted for scanning.""" diff --git a/src/cloudflare/types/unnamed_schema_ref_209db30ed499548152d6f3bccf720b54.py b/src/cloudflare/types/unnamed_schema_ref_209db30ed499548152d6f3bccf720b54.py deleted file mode 100644 index 10bf44de4ca..00000000000 --- a/src/cloudflare/types/unnamed_schema_ref_209db30ed499548152d6f3bccf720b54.py +++ /dev/null @@ -1,15 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing import Optional - -from .._models import BaseModel - -__all__ = ["UnnamedSchemaRef209db30ed499548152d6f3bccf720b54"] - - -class UnnamedSchemaRef209db30ed499548152d6f3bccf720b54(BaseModel): - category: Optional[str] = None - """Name of the category applied.""" - - verification_status: Optional[str] = None - """Result of human review for this categorization.""" diff --git a/src/cloudflare/types/unnamed_schema_ref_39419d70e2399b28b15cd660afd342fb.py b/src/cloudflare/types/unnamed_schema_ref_39419d70e2399b28b15cd660afd342fb.py deleted file mode 100644 index 26e75f4f2c0..00000000000 --- a/src/cloudflare/types/unnamed_schema_ref_39419d70e2399b28b15cd660afd342fb.py +++ /dev/null @@ -1,15 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing import Optional - -from .._models import BaseModel - -__all__ = ["UnnamedSchemaRef39419d70e2399b28b15cd660afd342fb"] - - -class UnnamedSchemaRef39419d70e2399b28b15cd660afd342fb(BaseModel): - url: Optional[str] = None - """URL that was submitted.""" - - url_id: Optional[int] = None - """ID assigned to this URL submission. Used to retrieve scanning results.""" diff --git a/src/cloudflare/types/unnamed_schema_ref_44e66100b948bfe723054c56b6144766.py b/src/cloudflare/types/unnamed_schema_ref_44e66100b948bfe723054c56b6144766.py deleted file mode 100644 index 6c251cd446f..00000000000 --- a/src/cloudflare/types/unnamed_schema_ref_44e66100b948bfe723054c56b6144766.py +++ /dev/null @@ -1,15 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing import Optional - -from .._models import BaseModel - -__all__ = ["UnnamedSchemaRef44e66100b948bfe723054c56b6144766"] - - -class UnnamedSchemaRef44e66100b948bfe723054c56b6144766(BaseModel): - url: Optional[str] = None - """URL that was skipped.""" - - url_id: Optional[int] = None - """ID of the submission of that URL that is currently scanning.""" diff --git a/src/cloudflare/types/unnamed_schema_ref_767c0981cf47f45f0c766253dbd18669.py b/src/cloudflare/types/unnamed_schema_ref_767c0981cf47f45f0c766253dbd18669.py deleted file mode 100644 index 18f780c6840..00000000000 --- a/src/cloudflare/types/unnamed_schema_ref_767c0981cf47f45f0c766253dbd18669.py +++ /dev/null @@ -1,12 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing import Optional - -from .._models import BaseModel - -__all__ = ["UnnamedSchemaRef767c0981cf47f45f0c766253dbd18669"] - - -class UnnamedSchemaRef767c0981cf47f45f0c766253dbd18669(BaseModel): - url: Optional[str] = None - """URL that was excluded.""" diff --git a/src/cloudflare/types/unnamed_schema_ref_9b4c9779a35b172cb69c71389ebc7014.py b/src/cloudflare/types/url_info_model_results.py similarity index 77% rename from src/cloudflare/types/unnamed_schema_ref_9b4c9779a35b172cb69c71389ebc7014.py rename to src/cloudflare/types/url_info_model_results.py index 1681812ac70..539650a1ac8 100644 --- a/src/cloudflare/types/unnamed_schema_ref_9b4c9779a35b172cb69c71389ebc7014.py +++ b/src/cloudflare/types/url_info_model_results.py @@ -6,10 +6,10 @@ from .._models import BaseModel -__all__ = ["UnnamedSchemaRef9b4c9779a35b172cb69c71389ebc7014"] +__all__ = ["URLInfoModelResults"] -class UnnamedSchemaRef9b4c9779a35b172cb69c71389ebc7014(BaseModel): +class URLInfoModelResults(BaseModel): ai_model_name: Optional[str] = FieldInfo(alias="model_name", default=None) """Name of the model.""" diff --git a/src/cloudflare/types/workers/scripts/__init__.py b/src/cloudflare/types/workers/scripts/__init__.py index 8cf9b7cd452..dca9f8b1963 100644 --- a/src/cloudflare/types/workers/scripts/__init__.py +++ b/src/cloudflare/types/workers/scripts/__init__.py @@ -2,7 +2,9 @@ from __future__ import annotations +from .schedule import Schedule as Schedule from .deployment import Deployment as Deployment +from .schedule_param import ScheduleParam as ScheduleParam from .consumer_script import ConsumerScript as ConsumerScript from .deployment_param import DeploymentParam as DeploymentParam from .tail_get_response import TailGetResponse as TailGetResponse @@ -23,6 +25,3 @@ from .deployment_create_params import DeploymentCreateParams as DeploymentCreateParams from .schedule_update_response import ScheduleUpdateResponse as ScheduleUpdateResponse from .deployment_create_response import DeploymentCreateResponse as DeploymentCreateResponse -from .unnamed_schema_ref_c8302c265937f9d6f96fd69644e56b26 import ( - UnnamedSchemaRefC8302c265937f9d6f96fd69644e56b26 as UnnamedSchemaRefC8302c265937f9d6f96fd69644e56b26, -) diff --git a/src/cloudflare/types/workers/scripts/unnamed_schema_ref_c8302c265937f9d6f96fd69644e56b26.py b/src/cloudflare/types/workers/scripts/schedule.py similarity index 67% rename from src/cloudflare/types/workers/scripts/unnamed_schema_ref_c8302c265937f9d6f96fd69644e56b26.py rename to src/cloudflare/types/workers/scripts/schedule.py index 65ebe2f742d..28b027a0796 100644 --- a/src/cloudflare/types/workers/scripts/unnamed_schema_ref_c8302c265937f9d6f96fd69644e56b26.py +++ b/src/cloudflare/types/workers/scripts/schedule.py @@ -4,10 +4,10 @@ from ...._models import BaseModel -__all__ = ["UnnamedSchemaRefC8302c265937f9d6f96fd69644e56b26"] +__all__ = ["Schedule"] -class UnnamedSchemaRefC8302c265937f9d6f96fd69644e56b26(BaseModel): +class Schedule(BaseModel): created_on: Optional[object] = None cron: Optional[object] = None diff --git a/src/cloudflare/types/workers/scripts/schedule_get_response.py b/src/cloudflare/types/workers/scripts/schedule_get_response.py index 3fd5a9f2087..5d430c7ce85 100644 --- a/src/cloudflare/types/workers/scripts/schedule_get_response.py +++ b/src/cloudflare/types/workers/scripts/schedule_get_response.py @@ -2,11 +2,11 @@ from typing import List, Optional +from .schedule import Schedule from ...._models import BaseModel -from .unnamed_schema_ref_c8302c265937f9d6f96fd69644e56b26 import UnnamedSchemaRefC8302c265937f9d6f96fd69644e56b26 __all__ = ["ScheduleGetResponse"] class ScheduleGetResponse(BaseModel): - schedules: Optional[List[UnnamedSchemaRefC8302c265937f9d6f96fd69644e56b26]] = None + schedules: Optional[List[Schedule]] = None diff --git a/src/cloudflare/types/workers/scripts/schedule_param.py b/src/cloudflare/types/workers/scripts/schedule_param.py new file mode 100644 index 00000000000..5054e6e4f94 --- /dev/null +++ b/src/cloudflare/types/workers/scripts/schedule_param.py @@ -0,0 +1,11 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from __future__ import annotations + +from typing_extensions import TypedDict + +__all__ = ["ScheduleParam"] + + +class ScheduleParam(TypedDict, total=False): + pass diff --git a/src/cloudflare/types/workers/scripts/schedule_update_response.py b/src/cloudflare/types/workers/scripts/schedule_update_response.py index abf3e52019b..0024bf49131 100644 --- a/src/cloudflare/types/workers/scripts/schedule_update_response.py +++ b/src/cloudflare/types/workers/scripts/schedule_update_response.py @@ -2,11 +2,11 @@ from typing import List, Optional +from .schedule import Schedule from ...._models import BaseModel -from .unnamed_schema_ref_c8302c265937f9d6f96fd69644e56b26 import UnnamedSchemaRefC8302c265937f9d6f96fd69644e56b26 __all__ = ["ScheduleUpdateResponse"] class ScheduleUpdateResponse(BaseModel): - schedules: Optional[List[UnnamedSchemaRefC8302c265937f9d6f96fd69644e56b26]] = None + schedules: Optional[List[Schedule]] = None diff --git a/tests/api_resources/addressing/test_prefixes.py b/tests/api_resources/addressing/test_prefixes.py index 8c570378484..1e3f989ea49 100644 --- a/tests/api_resources/addressing/test_prefixes.py +++ b/tests/api_resources/addressing/test_prefixes.py @@ -11,7 +11,10 @@ from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage from cloudflare.types.addressing import ( - Prefix, + PrefixGetResponse, + PrefixEditResponse, + PrefixListResponse, + PrefixCreateResponse, PrefixDeleteResponse, ) @@ -30,7 +33,7 @@ def test_method_create(self, client: Cloudflare) -> None: cidr="192.0.2.0/24", loa_document_id="d933b1530bc56c9953cf8ce166da8004", ) - assert_matches_type(Prefix, prefix, path=["response"]) + assert_matches_type(PrefixCreateResponse, prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -45,7 +48,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" prefix = response.parse() - assert_matches_type(Prefix, prefix, path=["response"]) + assert_matches_type(PrefixCreateResponse, prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -60,7 +63,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" prefix = response.parse() - assert_matches_type(Prefix, prefix, path=["response"]) + assert_matches_type(PrefixCreateResponse, prefix, path=["response"]) assert cast(Any, response.is_closed) is True @@ -81,7 +84,7 @@ def test_method_list(self, client: Cloudflare) -> None: prefix = client.addressing.prefixes.list( account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(SyncSinglePage[Prefix], prefix, path=["response"]) + assert_matches_type(SyncSinglePage[PrefixListResponse], prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -93,7 +96,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" prefix = response.parse() - assert_matches_type(SyncSinglePage[Prefix], prefix, path=["response"]) + assert_matches_type(SyncSinglePage[PrefixListResponse], prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -105,7 +108,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" prefix = response.parse() - assert_matches_type(SyncSinglePage[Prefix], prefix, path=["response"]) + assert_matches_type(SyncSinglePage[PrefixListResponse], prefix, path=["response"]) assert cast(Any, response.is_closed) is True @@ -182,7 +185,7 @@ def test_method_edit(self, client: Cloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", description="Internal test prefix", ) - assert_matches_type(Prefix, prefix, path=["response"]) + assert_matches_type(PrefixEditResponse, prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -196,7 +199,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" prefix = response.parse() - assert_matches_type(Prefix, prefix, path=["response"]) + assert_matches_type(PrefixEditResponse, prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -210,7 +213,7 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" prefix = response.parse() - assert_matches_type(Prefix, prefix, path=["response"]) + assert_matches_type(PrefixEditResponse, prefix, path=["response"]) assert cast(Any, response.is_closed) is True @@ -238,7 +241,7 @@ def test_method_get(self, client: Cloudflare) -> None: "023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(Prefix, prefix, path=["response"]) + assert_matches_type(PrefixGetResponse, prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -251,7 +254,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" prefix = response.parse() - assert_matches_type(Prefix, prefix, path=["response"]) + assert_matches_type(PrefixGetResponse, prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -264,7 +267,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" prefix = response.parse() - assert_matches_type(Prefix, prefix, path=["response"]) + assert_matches_type(PrefixGetResponse, prefix, path=["response"]) assert cast(Any, response.is_closed) is True @@ -296,7 +299,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None: cidr="192.0.2.0/24", loa_document_id="d933b1530bc56c9953cf8ce166da8004", ) - assert_matches_type(Prefix, prefix, path=["response"]) + assert_matches_type(PrefixCreateResponse, prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -311,7 +314,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" prefix = await response.parse() - assert_matches_type(Prefix, prefix, path=["response"]) + assert_matches_type(PrefixCreateResponse, prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -326,7 +329,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" prefix = await response.parse() - assert_matches_type(Prefix, prefix, path=["response"]) + assert_matches_type(PrefixCreateResponse, prefix, path=["response"]) assert cast(Any, response.is_closed) is True @@ -347,7 +350,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None: prefix = await async_client.addressing.prefixes.list( account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(AsyncSinglePage[Prefix], prefix, path=["response"]) + assert_matches_type(AsyncSinglePage[PrefixListResponse], prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -359,7 +362,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" prefix = await response.parse() - assert_matches_type(AsyncSinglePage[Prefix], prefix, path=["response"]) + assert_matches_type(AsyncSinglePage[PrefixListResponse], prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -371,7 +374,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" prefix = await response.parse() - assert_matches_type(AsyncSinglePage[Prefix], prefix, path=["response"]) + assert_matches_type(AsyncSinglePage[PrefixListResponse], prefix, path=["response"]) assert cast(Any, response.is_closed) is True @@ -448,7 +451,7 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", description="Internal test prefix", ) - assert_matches_type(Prefix, prefix, path=["response"]) + assert_matches_type(PrefixEditResponse, prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -462,7 +465,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" prefix = await response.parse() - assert_matches_type(Prefix, prefix, path=["response"]) + assert_matches_type(PrefixEditResponse, prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -476,7 +479,7 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" prefix = await response.parse() - assert_matches_type(Prefix, prefix, path=["response"]) + assert_matches_type(PrefixEditResponse, prefix, path=["response"]) assert cast(Any, response.is_closed) is True @@ -504,7 +507,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None: "023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(Prefix, prefix, path=["response"]) + assert_matches_type(PrefixGetResponse, prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -517,7 +520,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" prefix = await response.parse() - assert_matches_type(Prefix, prefix, path=["response"]) + assert_matches_type(PrefixGetResponse, prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -530,7 +533,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No assert response.http_request.headers.get("X-Stainless-Lang") == "python" prefix = await response.parse() - assert_matches_type(Prefix, prefix, path=["response"]) + assert_matches_type(PrefixGetResponse, prefix, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/logpush/test_jobs.py b/tests/api_resources/logpush/test_jobs.py index 7a9041a1064..f716fb9dda9 100644 --- a/tests/api_resources/logpush/test_jobs.py +++ b/tests/api_resources/logpush/test_jobs.py @@ -10,8 +10,13 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.logpush import JobDeleteResponse -from cloudflare.types.logpush.datasets import Job +from cloudflare.types.logpush import ( + JobGetResponse, + JobListResponse, + JobCreateResponse, + JobDeleteResponse, + JobUpdateResponse, +) base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -27,7 +32,7 @@ def test_method_create(self, client: Cloudflare) -> None: account_id="string", zone_id="string", ) - assert_matches_type(Optional[Job], job, path=["response"]) + assert_matches_type(Optional[JobCreateResponse], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -57,7 +62,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None: }, ownership_challenge="00000000000000000000", ) - assert_matches_type(Optional[Job], job, path=["response"]) + assert_matches_type(Optional[JobCreateResponse], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -71,7 +76,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" job = response.parse() - assert_matches_type(Optional[Job], job, path=["response"]) + assert_matches_type(Optional[JobCreateResponse], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -85,7 +90,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" job = response.parse() - assert_matches_type(Optional[Job], job, path=["response"]) + assert_matches_type(Optional[JobCreateResponse], job, path=["response"]) assert cast(Any, response.is_closed) is True @@ -114,7 +119,7 @@ def test_method_update(self, client: Cloudflare) -> None: account_id="string", zone_id="string", ) - assert_matches_type(Optional[Job], job, path=["response"]) + assert_matches_type(Optional[JobUpdateResponse], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -143,7 +148,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None: }, ownership_challenge="00000000000000000000", ) - assert_matches_type(Optional[Job], job, path=["response"]) + assert_matches_type(Optional[JobUpdateResponse], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -157,7 +162,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" job = response.parse() - assert_matches_type(Optional[Job], job, path=["response"]) + assert_matches_type(Optional[JobUpdateResponse], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -171,7 +176,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" job = response.parse() - assert_matches_type(Optional[Job], job, path=["response"]) + assert_matches_type(Optional[JobUpdateResponse], job, path=["response"]) assert cast(Any, response.is_closed) is True @@ -199,7 +204,7 @@ def test_method_list(self, client: Cloudflare) -> None: account_id="string", zone_id="string", ) - assert_matches_type(SyncSinglePage[Optional[Job]], job, path=["response"]) + assert_matches_type(SyncSinglePage[Optional[JobListResponse]], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -208,7 +213,7 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None: account_id="string", zone_id="string", ) - assert_matches_type(SyncSinglePage[Optional[Job]], job, path=["response"]) + assert_matches_type(SyncSinglePage[Optional[JobListResponse]], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -221,7 +226,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" job = response.parse() - assert_matches_type(SyncSinglePage[Optional[Job]], job, path=["response"]) + assert_matches_type(SyncSinglePage[Optional[JobListResponse]], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -234,7 +239,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" job = response.parse() - assert_matches_type(SyncSinglePage[Optional[Job]], job, path=["response"]) + assert_matches_type(SyncSinglePage[Optional[JobListResponse]], job, path=["response"]) assert cast(Any, response.is_closed) is True @@ -334,7 +339,7 @@ def test_method_get(self, client: Cloudflare) -> None: account_id="string", zone_id="string", ) - assert_matches_type(Optional[Job], job, path=["response"]) + assert_matches_type(Optional[JobGetResponse], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -344,7 +349,7 @@ def test_method_get_with_all_params(self, client: Cloudflare) -> None: account_id="string", zone_id="string", ) - assert_matches_type(Optional[Job], job, path=["response"]) + assert_matches_type(Optional[JobGetResponse], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -358,7 +363,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" job = response.parse() - assert_matches_type(Optional[Job], job, path=["response"]) + assert_matches_type(Optional[JobGetResponse], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -372,7 +377,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" job = response.parse() - assert_matches_type(Optional[Job], job, path=["response"]) + assert_matches_type(Optional[JobGetResponse], job, path=["response"]) assert cast(Any, response.is_closed) is True @@ -405,7 +410,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None: account_id="string", zone_id="string", ) - assert_matches_type(Optional[Job], job, path=["response"]) + assert_matches_type(Optional[JobCreateResponse], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -435,7 +440,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare }, ownership_challenge="00000000000000000000", ) - assert_matches_type(Optional[Job], job, path=["response"]) + assert_matches_type(Optional[JobCreateResponse], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -449,7 +454,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" job = await response.parse() - assert_matches_type(Optional[Job], job, path=["response"]) + assert_matches_type(Optional[JobCreateResponse], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -463,7 +468,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" job = await response.parse() - assert_matches_type(Optional[Job], job, path=["response"]) + assert_matches_type(Optional[JobCreateResponse], job, path=["response"]) assert cast(Any, response.is_closed) is True @@ -492,7 +497,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None: account_id="string", zone_id="string", ) - assert_matches_type(Optional[Job], job, path=["response"]) + assert_matches_type(Optional[JobUpdateResponse], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -521,7 +526,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare }, ownership_challenge="00000000000000000000", ) - assert_matches_type(Optional[Job], job, path=["response"]) + assert_matches_type(Optional[JobUpdateResponse], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -535,7 +540,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" job = await response.parse() - assert_matches_type(Optional[Job], job, path=["response"]) + assert_matches_type(Optional[JobUpdateResponse], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -549,7 +554,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" job = await response.parse() - assert_matches_type(Optional[Job], job, path=["response"]) + assert_matches_type(Optional[JobUpdateResponse], job, path=["response"]) assert cast(Any, response.is_closed) is True @@ -577,7 +582,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None: account_id="string", zone_id="string", ) - assert_matches_type(AsyncSinglePage[Optional[Job]], job, path=["response"]) + assert_matches_type(AsyncSinglePage[Optional[JobListResponse]], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -586,7 +591,7 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) account_id="string", zone_id="string", ) - assert_matches_type(AsyncSinglePage[Optional[Job]], job, path=["response"]) + assert_matches_type(AsyncSinglePage[Optional[JobListResponse]], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -599,7 +604,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" job = await response.parse() - assert_matches_type(AsyncSinglePage[Optional[Job]], job, path=["response"]) + assert_matches_type(AsyncSinglePage[Optional[JobListResponse]], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -612,7 +617,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" job = await response.parse() - assert_matches_type(AsyncSinglePage[Optional[Job]], job, path=["response"]) + assert_matches_type(AsyncSinglePage[Optional[JobListResponse]], job, path=["response"]) assert cast(Any, response.is_closed) is True @@ -712,7 +717,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None: account_id="string", zone_id="string", ) - assert_matches_type(Optional[Job], job, path=["response"]) + assert_matches_type(Optional[JobGetResponse], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -722,7 +727,7 @@ async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) - account_id="string", zone_id="string", ) - assert_matches_type(Optional[Job], job, path=["response"]) + assert_matches_type(Optional[JobGetResponse], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -736,7 +741,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" job = await response.parse() - assert_matches_type(Optional[Job], job, path=["response"]) + assert_matches_type(Optional[JobGetResponse], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -750,7 +755,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No assert response.http_request.headers.get("X-Stainless-Lang") == "python" job = await response.parse() - assert_matches_type(Optional[Job], job, path=["response"]) + assert_matches_type(Optional[JobGetResponse], job, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/origin_tls_client_auth/hostnames/test_certificates.py b/tests/api_resources/origin_tls_client_auth/hostnames/test_certificates.py index 49bebd3d608..ff3cb79a4b9 100644 --- a/tests/api_resources/origin_tls_client_auth/hostnames/test_certificates.py +++ b/tests/api_resources/origin_tls_client_auth/hostnames/test_certificates.py @@ -12,7 +12,9 @@ from cloudflare.pagination import SyncSinglePage, AsyncSinglePage from cloudflare.types.origin_tls_client_auth import AuthenticatedOriginPull from cloudflare.types.origin_tls_client_auth.hostnames import ( - Certificate, + CertificateGetResponse, + CertificateCreateResponse, + CertificateDeleteResponse, ) base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -29,7 +31,7 @@ def test_method_create(self, client: Cloudflare) -> None: certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n", private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n", ) - assert_matches_type(Certificate, certificate, path=["response"]) + assert_matches_type(CertificateCreateResponse, certificate, path=["response"]) @pytest.mark.skip() @parametrize @@ -43,7 +45,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" certificate = response.parse() - assert_matches_type(Certificate, certificate, path=["response"]) + assert_matches_type(CertificateCreateResponse, certificate, path=["response"]) @pytest.mark.skip() @parametrize @@ -57,7 +59,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" certificate = response.parse() - assert_matches_type(Certificate, certificate, path=["response"]) + assert_matches_type(CertificateCreateResponse, certificate, path=["response"]) assert cast(Any, response.is_closed) is True @@ -121,7 +123,7 @@ def test_method_delete(self, client: Cloudflare) -> None: zone_id="023e105f4ecef8ad9ca31a8372d0c353", body={}, ) - assert_matches_type(Certificate, certificate, path=["response"]) + assert_matches_type(CertificateDeleteResponse, certificate, path=["response"]) @pytest.mark.skip() @parametrize @@ -135,7 +137,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" certificate = response.parse() - assert_matches_type(Certificate, certificate, path=["response"]) + assert_matches_type(CertificateDeleteResponse, certificate, path=["response"]) @pytest.mark.skip() @parametrize @@ -149,7 +151,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" certificate = response.parse() - assert_matches_type(Certificate, certificate, path=["response"]) + assert_matches_type(CertificateDeleteResponse, certificate, path=["response"]) assert cast(Any, response.is_closed) is True @@ -177,7 +179,7 @@ def test_method_get(self, client: Cloudflare) -> None: "023e105f4ecef8ad9ca31a8372d0c353", zone_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(Certificate, certificate, path=["response"]) + assert_matches_type(CertificateGetResponse, certificate, path=["response"]) @pytest.mark.skip() @parametrize @@ -190,7 +192,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" certificate = response.parse() - assert_matches_type(Certificate, certificate, path=["response"]) + assert_matches_type(CertificateGetResponse, certificate, path=["response"]) @pytest.mark.skip() @parametrize @@ -203,7 +205,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" certificate = response.parse() - assert_matches_type(Certificate, certificate, path=["response"]) + assert_matches_type(CertificateGetResponse, certificate, path=["response"]) assert cast(Any, response.is_closed) is True @@ -234,7 +236,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None: certificate="-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n", private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n", ) - assert_matches_type(Certificate, certificate, path=["response"]) + assert_matches_type(CertificateCreateResponse, certificate, path=["response"]) @pytest.mark.skip() @parametrize @@ -248,7 +250,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" certificate = await response.parse() - assert_matches_type(Certificate, certificate, path=["response"]) + assert_matches_type(CertificateCreateResponse, certificate, path=["response"]) @pytest.mark.skip() @parametrize @@ -262,7 +264,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" certificate = await response.parse() - assert_matches_type(Certificate, certificate, path=["response"]) + assert_matches_type(CertificateCreateResponse, certificate, path=["response"]) assert cast(Any, response.is_closed) is True @@ -326,7 +328,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None: zone_id="023e105f4ecef8ad9ca31a8372d0c353", body={}, ) - assert_matches_type(Certificate, certificate, path=["response"]) + assert_matches_type(CertificateDeleteResponse, certificate, path=["response"]) @pytest.mark.skip() @parametrize @@ -340,7 +342,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" certificate = await response.parse() - assert_matches_type(Certificate, certificate, path=["response"]) + assert_matches_type(CertificateDeleteResponse, certificate, path=["response"]) @pytest.mark.skip() @parametrize @@ -354,7 +356,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" certificate = await response.parse() - assert_matches_type(Certificate, certificate, path=["response"]) + assert_matches_type(CertificateDeleteResponse, certificate, path=["response"]) assert cast(Any, response.is_closed) is True @@ -382,7 +384,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None: "023e105f4ecef8ad9ca31a8372d0c353", zone_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(Certificate, certificate, path=["response"]) + assert_matches_type(CertificateGetResponse, certificate, path=["response"]) @pytest.mark.skip() @parametrize @@ -395,7 +397,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" certificate = await response.parse() - assert_matches_type(Certificate, certificate, path=["response"]) + assert_matches_type(CertificateGetResponse, certificate, path=["response"]) @pytest.mark.skip() @parametrize @@ -408,7 +410,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No assert response.http_request.headers.get("X-Stainless-Lang") == "python" certificate = await response.parse() - assert_matches_type(Certificate, certificate, path=["response"]) + assert_matches_type(CertificateGetResponse, certificate, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/secondary_dns/test_peers.py b/tests/api_resources/secondary_dns/test_peers.py index c42e05c6157..a0bebc373fe 100644 --- a/tests/api_resources/secondary_dns/test_peers.py +++ b/tests/api_resources/secondary_dns/test_peers.py @@ -11,8 +11,11 @@ from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage from cloudflare.types.secondary_dns import ( - Peer, + PeerGetResponse, + PeerListResponse, + PeerCreateResponse, PeerDeleteResponse, + PeerUpdateResponse, ) base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -28,7 +31,7 @@ def test_method_create(self, client: Cloudflare) -> None: account_id="01a7362d577a6c3019a474fd6f485823", body={}, ) - assert_matches_type(Peer, peer, path=["response"]) + assert_matches_type(PeerCreateResponse, peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -41,7 +44,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" peer = response.parse() - assert_matches_type(Peer, peer, path=["response"]) + assert_matches_type(PeerCreateResponse, peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -54,7 +57,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" peer = response.parse() - assert_matches_type(Peer, peer, path=["response"]) + assert_matches_type(PeerCreateResponse, peer, path=["response"]) assert cast(Any, response.is_closed) is True @@ -75,7 +78,7 @@ def test_method_update(self, client: Cloudflare) -> None: account_id="01a7362d577a6c3019a474fd6f485823", name="my-peer-1", ) - assert_matches_type(Peer, peer, path=["response"]) + assert_matches_type(PeerUpdateResponse, peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -89,7 +92,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None: port=53, tsig_id="69cd1e104af3e6ed3cb344f263fd0d5a", ) - assert_matches_type(Peer, peer, path=["response"]) + assert_matches_type(PeerUpdateResponse, peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -103,7 +106,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" peer = response.parse() - assert_matches_type(Peer, peer, path=["response"]) + assert_matches_type(PeerUpdateResponse, peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -117,7 +120,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" peer = response.parse() - assert_matches_type(Peer, peer, path=["response"]) + assert_matches_type(PeerUpdateResponse, peer, path=["response"]) assert cast(Any, response.is_closed) is True @@ -144,7 +147,7 @@ def test_method_list(self, client: Cloudflare) -> None: peer = client.secondary_dns.peers.list( account_id="01a7362d577a6c3019a474fd6f485823", ) - assert_matches_type(SyncSinglePage[Peer], peer, path=["response"]) + assert_matches_type(SyncSinglePage[PeerListResponse], peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -156,7 +159,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" peer = response.parse() - assert_matches_type(SyncSinglePage[Peer], peer, path=["response"]) + assert_matches_type(SyncSinglePage[PeerListResponse], peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -168,7 +171,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" peer = response.parse() - assert_matches_type(SyncSinglePage[Peer], peer, path=["response"]) + assert_matches_type(SyncSinglePage[PeerListResponse], peer, path=["response"]) assert cast(Any, response.is_closed) is True @@ -244,7 +247,7 @@ def test_method_get(self, client: Cloudflare) -> None: "23ff594956f20c2a721606e94745a8aa", account_id="01a7362d577a6c3019a474fd6f485823", ) - assert_matches_type(Peer, peer, path=["response"]) + assert_matches_type(PeerGetResponse, peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -257,7 +260,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" peer = response.parse() - assert_matches_type(Peer, peer, path=["response"]) + assert_matches_type(PeerGetResponse, peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -270,7 +273,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" peer = response.parse() - assert_matches_type(Peer, peer, path=["response"]) + assert_matches_type(PeerGetResponse, peer, path=["response"]) assert cast(Any, response.is_closed) is True @@ -300,7 +303,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None: account_id="01a7362d577a6c3019a474fd6f485823", body={}, ) - assert_matches_type(Peer, peer, path=["response"]) + assert_matches_type(PeerCreateResponse, peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -313,7 +316,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" peer = await response.parse() - assert_matches_type(Peer, peer, path=["response"]) + assert_matches_type(PeerCreateResponse, peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -326,7 +329,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" peer = await response.parse() - assert_matches_type(Peer, peer, path=["response"]) + assert_matches_type(PeerCreateResponse, peer, path=["response"]) assert cast(Any, response.is_closed) is True @@ -347,7 +350,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None: account_id="01a7362d577a6c3019a474fd6f485823", name="my-peer-1", ) - assert_matches_type(Peer, peer, path=["response"]) + assert_matches_type(PeerUpdateResponse, peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -361,7 +364,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare port=53, tsig_id="69cd1e104af3e6ed3cb344f263fd0d5a", ) - assert_matches_type(Peer, peer, path=["response"]) + assert_matches_type(PeerUpdateResponse, peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -375,7 +378,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" peer = await response.parse() - assert_matches_type(Peer, peer, path=["response"]) + assert_matches_type(PeerUpdateResponse, peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -389,7 +392,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" peer = await response.parse() - assert_matches_type(Peer, peer, path=["response"]) + assert_matches_type(PeerUpdateResponse, peer, path=["response"]) assert cast(Any, response.is_closed) is True @@ -416,7 +419,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None: peer = await async_client.secondary_dns.peers.list( account_id="01a7362d577a6c3019a474fd6f485823", ) - assert_matches_type(AsyncSinglePage[Peer], peer, path=["response"]) + assert_matches_type(AsyncSinglePage[PeerListResponse], peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -428,7 +431,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" peer = await response.parse() - assert_matches_type(AsyncSinglePage[Peer], peer, path=["response"]) + assert_matches_type(AsyncSinglePage[PeerListResponse], peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -440,7 +443,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" peer = await response.parse() - assert_matches_type(AsyncSinglePage[Peer], peer, path=["response"]) + assert_matches_type(AsyncSinglePage[PeerListResponse], peer, path=["response"]) assert cast(Any, response.is_closed) is True @@ -516,7 +519,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None: "23ff594956f20c2a721606e94745a8aa", account_id="01a7362d577a6c3019a474fd6f485823", ) - assert_matches_type(Peer, peer, path=["response"]) + assert_matches_type(PeerGetResponse, peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -529,7 +532,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" peer = await response.parse() - assert_matches_type(Peer, peer, path=["response"]) + assert_matches_type(PeerGetResponse, peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -542,7 +545,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No assert response.http_request.headers.get("X-Stainless-Lang") == "python" peer = await response.parse() - assert_matches_type(Peer, peer, path=["response"]) + assert_matches_type(PeerGetResponse, peer, path=["response"]) assert cast(Any, response.is_closed) is True