diff --git a/api.md b/api.md index de02ee85864..1ab3b15ccc2 100644 --- a/api.md +++ b/api.md @@ -3,7 +3,6 @@ ```python from cloudflare.types import ( ErrorData, - Logging, ResponseInfo, UnnamedSchemaRef10, UnnamedSchemaRef100, @@ -59,7 +58,6 @@ from cloudflare.types import ( UnnamedSchemaRef161, UnnamedSchemaRef162, UnnamedSchemaRef163, - UnnamedSchemaRef167, UnnamedSchemaRef169, UnnamedSchemaRef170, UnnamedSchemaRef171, @@ -285,15 +283,15 @@ Methods: Types: ```python -from cloudflare.types.user.firewall import FirewallRule, AccessRuleDeleteResponse +from cloudflare.types.user.firewall import AccessRule, AccessRuleDeleteResponse ``` Methods: -- client.user.firewall.access_rules.create(\*\*params) -> Optional -- client.user.firewall.access_rules.list(\*\*params) -> SyncV4PagePaginationArray[FirewallRule] +- client.user.firewall.access_rules.create(\*\*params) -> Optional +- client.user.firewall.access_rules.list(\*\*params) -> SyncV4PagePaginationArray[AccessRule] - client.user.firewall.access_rules.delete(identifier, \*\*params) -> Optional -- client.user.firewall.access_rules.edit(identifier, \*\*params) -> Optional +- client.user.firewall.access_rules.edit(identifier, \*\*params) -> Optional ## Invites @@ -317,7 +315,7 @@ Types: ```python from cloudflare.types.user.load_balancers import ( - LoadBalancingMonitor, + Monitor, MonitorDeleteResponse, MonitorPreviewResponse, MonitorReferencesResponse, @@ -326,12 +324,12 @@ from cloudflare.types.user.load_balancers import ( Methods: -- client.user.load_balancers.monitors.create(\*\*params) -> LoadBalancingMonitor -- client.user.load_balancers.monitors.update(monitor_id, \*\*params) -> LoadBalancingMonitor -- client.user.load_balancers.monitors.list() -> SyncSinglePage[LoadBalancingMonitor] +- client.user.load_balancers.monitors.create(\*\*params) -> Monitor +- client.user.load_balancers.monitors.update(monitor_id, \*\*params) -> Monitor +- client.user.load_balancers.monitors.list() -> SyncSinglePage[Monitor] - client.user.load_balancers.monitors.delete(monitor_id, \*\*params) -> MonitorDeleteResponse -- client.user.load_balancers.monitors.edit(monitor_id, \*\*params) -> LoadBalancingMonitor -- client.user.load_balancers.monitors.get(monitor_id) -> LoadBalancingMonitor +- client.user.load_balancers.monitors.edit(monitor_id, \*\*params) -> Monitor +- client.user.load_balancers.monitors.get(monitor_id) -> Monitor - client.user.load_balancers.monitors.preview(monitor_id, \*\*params) -> MonitorPreviewResponse - client.user.load_balancers.monitors.references(monitor_id) -> Optional @@ -341,7 +339,7 @@ Types: ```python from cloudflare.types.user.load_balancers import ( - LoadBalancingPool, + Pool, PoolDeleteResponse, PoolHealthResponse, PoolPreviewResponse, @@ -351,12 +349,12 @@ from cloudflare.types.user.load_balancers import ( Methods: -- client.user.load_balancers.pools.create(\*\*params) -> LoadBalancingPool -- client.user.load_balancers.pools.update(pool_id, \*\*params) -> LoadBalancingPool -- client.user.load_balancers.pools.list(\*\*params) -> SyncSinglePage[LoadBalancingPool] +- client.user.load_balancers.pools.create(\*\*params) -> Pool +- client.user.load_balancers.pools.update(pool_id, \*\*params) -> Pool +- client.user.load_balancers.pools.list(\*\*params) -> SyncSinglePage[Pool] - client.user.load_balancers.pools.delete(pool_id, \*\*params) -> PoolDeleteResponse -- client.user.load_balancers.pools.edit(pool_id, \*\*params) -> LoadBalancingPool -- client.user.load_balancers.pools.get(pool_id) -> LoadBalancingPool +- client.user.load_balancers.pools.edit(pool_id, \*\*params) -> Pool +- client.user.load_balancers.pools.get(pool_id) -> Pool - client.user.load_balancers.pools.health(pool_id) -> PoolHealthResponse - client.user.load_balancers.pools.preview(pool_id, \*\*params) -> PoolPreviewResponse - client.user.load_balancers.pools.references(pool_id) -> Optional @@ -1193,13 +1191,13 @@ Methods: Types: ```python -from cloudflare.types.zones import CustomNameserverUpdateResponse +from cloudflare.types.zones import CustomNameserverUpdateResponse, CustomNameserverGetResponse ``` Methods: - client.zones.custom_nameservers.update(\*, zone_id, \*\*params) -> Optional -- client.zones.custom_nameservers.get(\*, zone_id) -> Optional +- client.zones.custom_nameservers.get(\*, zone_id) -> Optional ## Holds @@ -1276,12 +1274,12 @@ from cloudflare.types.load_balancers import MonitorDeleteResponse Methods: -- client.load_balancers.monitors.create(\*, account_id, \*\*params) -> LoadBalancingMonitor -- client.load_balancers.monitors.update(monitor_id, \*, account_id, \*\*params) -> LoadBalancingMonitor -- client.load_balancers.monitors.list(\*, account_id) -> SyncSinglePage[LoadBalancingMonitor] +- client.load_balancers.monitors.create(\*, account_id, \*\*params) -> Monitor +- client.load_balancers.monitors.update(monitor_id, \*, account_id, \*\*params) -> Monitor +- client.load_balancers.monitors.list(\*, account_id) -> SyncSinglePage[Monitor] - client.load_balancers.monitors.delete(monitor_id, \*, account_id, \*\*params) -> MonitorDeleteResponse -- client.load_balancers.monitors.edit(monitor_id, \*, account_id, \*\*params) -> LoadBalancingMonitor -- client.load_balancers.monitors.get(monitor_id, \*, account_id) -> LoadBalancingMonitor +- client.load_balancers.monitors.edit(monitor_id, \*, account_id, \*\*params) -> Monitor +- client.load_balancers.monitors.get(monitor_id, \*, account_id) -> Monitor ### Previews @@ -1317,12 +1315,12 @@ from cloudflare.types.load_balancers import PoolDeleteResponse Methods: -- client.load_balancers.pools.create(\*, account_id, \*\*params) -> LoadBalancingPool -- client.load_balancers.pools.update(pool_id, \*, account_id, \*\*params) -> LoadBalancingPool -- client.load_balancers.pools.list(\*, account_id, \*\*params) -> SyncSinglePage[LoadBalancingPool] +- client.load_balancers.pools.create(\*, account_id, \*\*params) -> Pool +- client.load_balancers.pools.update(pool_id, \*, account_id, \*\*params) -> Pool +- client.load_balancers.pools.list(\*, account_id, \*\*params) -> SyncSinglePage[Pool] - client.load_balancers.pools.delete(pool_id, \*, account_id, \*\*params) -> PoolDeleteResponse -- client.load_balancers.pools.edit(pool_id, \*, account_id, \*\*params) -> LoadBalancingPool -- client.load_balancers.pools.get(pool_id, \*, account_id) -> LoadBalancingPool +- client.load_balancers.pools.edit(pool_id, \*, account_id, \*\*params) -> Pool +- client.load_balancers.pools.get(pool_id, \*, account_id) -> Pool ### Health @@ -3115,6 +3113,7 @@ from cloudflare.types import ( QueueCreateResponse, QueueUpdateResponse, QueueListResponse, + QueueDeleteResponse, QueueGetResponse, ) ``` @@ -3124,7 +3123,7 @@ Methods: - client.queues.create(\*, account_id, \*\*params) -> Optional - client.queues.update(queue_id, \*, account_id, \*\*params) -> Optional - client.queues.list(\*, account_id) -> Optional -- client.queues.delete(queue_id, \*, account_id, \*\*params) -> Optional +- client.queues.delete(queue_id, \*, account_id, \*\*params) -> Optional - client.queues.get(queue_id, \*, account_id) -> Optional ## Consumers @@ -3133,8 +3132,10 @@ Types: ```python from cloudflare.types.queues import ( + Consumer, ConsumerCreateResponse, ConsumerUpdateResponse, + ConsumerDeleteResponse, ConsumerGetResponse, ) ``` @@ -3143,7 +3144,7 @@ Methods: - client.queues.consumers.create(queue_id, \*, account_id, \*\*params) -> Optional - client.queues.consumers.update(consumer_id, \*, account_id, queue_id, \*\*params) -> Optional -- client.queues.consumers.delete(consumer_id, \*, account_id, queue_id, \*\*params) -> Optional +- client.queues.consumers.delete(consumer_id, \*, account_id, queue_id, \*\*params) -> Optional - client.queues.consumers.get(queue_id, \*, account_id) -> Optional ## Messages @@ -3151,7 +3152,7 @@ Methods: Types: ```python -from cloudflare.types.queues import QueueConsumer, MessageAckResponse, MessagePullResponse +from cloudflare.types.queues import MessageAckResponse, MessagePullResponse ``` Methods: @@ -3233,6 +3234,7 @@ Types: ```python from cloudflare.types import ( + Logging, RulesetCreateResponse, RulesetUpdateResponse, RulesetListResponse, @@ -3414,6 +3416,7 @@ Types: from cloudflare.types.addressing import ( AddressingAddressMaps, AddressMapCreateResponse, + AddressMapDeleteResponse, AddressMapGetResponse, ) ``` @@ -3422,30 +3425,48 @@ Methods: - client.addressing.address_maps.create(\*, account_id, \*\*params) -> AddressMapCreateResponse - client.addressing.address_maps.list(\*, account_id) -> SyncSinglePage[AddressingAddressMaps] -- client.addressing.address_maps.delete(address_map_id, \*, account_id, \*\*params) -> Optional +- client.addressing.address_maps.delete(address_map_id, \*, account_id, \*\*params) -> Optional - client.addressing.address_maps.edit(address_map_id, \*, account_id, \*\*params) -> AddressingAddressMaps - client.addressing.address_maps.get(address_map_id, \*, account_id) -> AddressMapGetResponse ### Accounts +Types: + +```python +from cloudflare.types.addressing.address_maps import AccountUpdateResponse, AccountDeleteResponse +``` + Methods: -- client.addressing.address_maps.accounts.update(address_map_id, \*, account_id, \*\*params) -> Optional -- client.addressing.address_maps.accounts.delete(address_map_id, \*, account_id, \*\*params) -> Optional +- client.addressing.address_maps.accounts.update(address_map_id, \*, account_id, \*\*params) -> Optional +- client.addressing.address_maps.accounts.delete(address_map_id, \*, account_id, \*\*params) -> Optional ### IPs +Types: + +```python +from cloudflare.types.addressing.address_maps import IPUpdateResponse, IPDeleteResponse +``` + Methods: -- client.addressing.address_maps.ips.update(ip_address, \*, account_id, address_map_id, \*\*params) -> Optional -- client.addressing.address_maps.ips.delete(ip_address, \*, account_id, address_map_id, \*\*params) -> Optional +- client.addressing.address_maps.ips.update(ip_address, \*, account_id, address_map_id, \*\*params) -> Optional +- client.addressing.address_maps.ips.delete(ip_address, \*, account_id, address_map_id, \*\*params) -> Optional ### Zones +Types: + +```python +from cloudflare.types.addressing.address_maps import ZoneUpdateResponse, ZoneDeleteResponse +``` + Methods: -- client.addressing.address_maps.zones.update(address_map_id, \*, zone_id, account_id, \*\*params) -> Optional -- client.addressing.address_maps.zones.delete(address_map_id, \*, zone_id, account_id, \*\*params) -> Optional +- client.addressing.address_maps.zones.update(address_map_id, \*, zone_id, account_id, \*\*params) -> Optional +- client.addressing.address_maps.zones.delete(address_map_id, \*, zone_id, account_id, \*\*params) -> Optional ## LOADocuments @@ -3476,14 +3497,18 @@ Methods: Types: ```python -from cloudflare.types.addressing import AddressingIpamPrefixes, UnnamedSchemaRef6 +from cloudflare.types.addressing import ( + AddressingIpamPrefixes, + UnnamedSchemaRef6, + PrefixDeleteResponse, +) ``` Methods: - client.addressing.prefixes.create(\*, account_id, \*\*params) -> AddressingIpamPrefixes - client.addressing.prefixes.list(\*, account_id) -> SyncSinglePage[AddressingIpamPrefixes] -- client.addressing.prefixes.delete(prefix_id, \*, account_id, \*\*params) -> Optional +- client.addressing.prefixes.delete(prefix_id, \*, account_id, \*\*params) -> Optional - client.addressing.prefixes.edit(prefix_id, \*, account_id, \*\*params) -> AddressingIpamPrefixes - client.addressing.prefixes.get(prefix_id, \*, account_id) -> AddressingIpamPrefixes @@ -4620,6 +4645,7 @@ Types: from cloudflare.types.alerting.destinations import ( AlertingPagerduty, PagerdutyCreateResponse, + PagerdutyDeleteResponse, PagerdutyGetResponse, PagerdutyLinkResponse, ) @@ -4628,7 +4654,7 @@ from cloudflare.types.alerting.destinations import ( Methods: - client.alerting.destinations.pagerduty.create(\*, account_id) -> PagerdutyCreateResponse -- client.alerting.destinations.pagerduty.delete(\*, account_id) -> Optional +- client.alerting.destinations.pagerduty.delete(\*, account_id) -> Optional - client.alerting.destinations.pagerduty.get(\*, account_id) -> Optional - client.alerting.destinations.pagerduty.link(token_id, \*, account_id) -> PagerdutyLinkResponse @@ -4641,6 +4667,7 @@ from cloudflare.types.alerting.destinations import ( AlertingWebhooks, WebhookCreateResponse, WebhookUpdateResponse, + WebhookDeleteResponse, ) ``` @@ -4649,7 +4676,7 @@ Methods: - client.alerting.destinations.webhooks.create(\*, account_id, \*\*params) -> WebhookCreateResponse - client.alerting.destinations.webhooks.update(webhook_id, \*, account_id, \*\*params) -> WebhookUpdateResponse - client.alerting.destinations.webhooks.list(\*, account_id) -> SyncSinglePage[AlertingWebhooks] -- client.alerting.destinations.webhooks.delete(webhook_id, \*, account_id) -> Optional +- client.alerting.destinations.webhooks.delete(webhook_id, \*, account_id) -> Optional - client.alerting.destinations.webhooks.get(webhook_id, \*, account_id) -> AlertingWebhooks ## History @@ -4669,7 +4696,12 @@ Methods: Types: ```python -from cloudflare.types.alerting import AlertingPolicies, PolicyCreateResponse, PolicyUpdateResponse +from cloudflare.types.alerting import ( + AlertingPolicies, + PolicyCreateResponse, + PolicyUpdateResponse, + PolicyDeleteResponse, +) ``` Methods: @@ -4677,7 +4709,7 @@ Methods: - client.alerting.policies.create(\*, account_id, \*\*params) -> PolicyCreateResponse - client.alerting.policies.update(policy_id, \*, account_id, \*\*params) -> PolicyUpdateResponse - client.alerting.policies.list(\*, account_id) -> SyncSinglePage[AlertingPolicies] -- client.alerting.policies.delete(policy_id, \*, account_id) -> Optional +- client.alerting.policies.delete(policy_id, \*, account_id) -> Optional - client.alerting.policies.get(policy_id, \*, account_id) -> AlertingPolicies # D1 diff --git a/src/cloudflare/resources/addressing/address_maps/accounts.py b/src/cloudflare/resources/addressing/address_maps/accounts.py index 23a60c572f4..71b9fb4dd2a 100644 --- a/src/cloudflare/resources/addressing/address_maps/accounts.py +++ b/src/cloudflare/resources/addressing/address_maps/accounts.py @@ -23,8 +23,12 @@ from ...._base_client import ( make_request_options, ) -from ....types.shared import UnnamedSchemaRef167 -from ....types.addressing.address_maps import account_delete_params, account_update_params +from ....types.addressing.address_maps import ( + AccountDeleteResponse, + AccountUpdateResponse, + account_delete_params, + account_update_params, +) __all__ = ["Accounts", "AsyncAccounts"] @@ -50,7 +54,7 @@ def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[UnnamedSchemaRef167]: + ) -> Optional[AccountUpdateResponse]: """ Add an account as a member of a particular address map. @@ -72,7 +76,7 @@ def update( if not address_map_id: raise ValueError(f"Expected a non-empty value for `address_map_id` but received {address_map_id!r}") return cast( - Optional[UnnamedSchemaRef167], + Optional[AccountUpdateResponse], self._put( f"/accounts/{account_id}/addressing/address_maps/{address_map_id}/accounts/{account_id}", body=maybe_transform(body, account_update_params.AccountUpdateParams), @@ -84,7 +88,7 @@ def update( post_parser=ResultWrapper._unwrapper, ), cast_to=cast( - Any, ResultWrapper[UnnamedSchemaRef167] + Any, ResultWrapper[AccountUpdateResponse] ), # Union types cannot be passed in as arguments in the type system ), ) @@ -101,7 +105,7 @@ def delete( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[UnnamedSchemaRef167]: + ) -> Optional[AccountDeleteResponse]: """ Remove an account as a member of a particular address map. @@ -123,7 +127,7 @@ def delete( if not address_map_id: raise ValueError(f"Expected a non-empty value for `address_map_id` but received {address_map_id!r}") return cast( - Optional[UnnamedSchemaRef167], + Optional[AccountDeleteResponse], self._delete( f"/accounts/{account_id}/addressing/address_maps/{address_map_id}/accounts/{account_id}", body=maybe_transform(body, account_delete_params.AccountDeleteParams), @@ -135,7 +139,7 @@ def delete( post_parser=ResultWrapper._unwrapper, ), cast_to=cast( - Any, ResultWrapper[UnnamedSchemaRef167] + Any, ResultWrapper[AccountDeleteResponse] ), # Union types cannot be passed in as arguments in the type system ), ) @@ -162,7 +166,7 @@ async def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[UnnamedSchemaRef167]: + ) -> Optional[AccountUpdateResponse]: """ Add an account as a member of a particular address map. @@ -184,7 +188,7 @@ async def update( if not address_map_id: raise ValueError(f"Expected a non-empty value for `address_map_id` but received {address_map_id!r}") return cast( - Optional[UnnamedSchemaRef167], + Optional[AccountUpdateResponse], await self._put( f"/accounts/{account_id}/addressing/address_maps/{address_map_id}/accounts/{account_id}", body=await async_maybe_transform(body, account_update_params.AccountUpdateParams), @@ -196,7 +200,7 @@ async def update( post_parser=ResultWrapper._unwrapper, ), cast_to=cast( - Any, ResultWrapper[UnnamedSchemaRef167] + Any, ResultWrapper[AccountUpdateResponse] ), # Union types cannot be passed in as arguments in the type system ), ) @@ -213,7 +217,7 @@ async def delete( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[UnnamedSchemaRef167]: + ) -> Optional[AccountDeleteResponse]: """ Remove an account as a member of a particular address map. @@ -235,7 +239,7 @@ async def delete( if not address_map_id: raise ValueError(f"Expected a non-empty value for `address_map_id` but received {address_map_id!r}") return cast( - Optional[UnnamedSchemaRef167], + Optional[AccountDeleteResponse], await self._delete( f"/accounts/{account_id}/addressing/address_maps/{address_map_id}/accounts/{account_id}", body=await async_maybe_transform(body, account_delete_params.AccountDeleteParams), @@ -247,7 +251,7 @@ async def delete( post_parser=ResultWrapper._unwrapper, ), cast_to=cast( - Any, ResultWrapper[UnnamedSchemaRef167] + Any, ResultWrapper[AccountDeleteResponse] ), # Union types cannot be passed in as arguments in the type system ), ) diff --git a/src/cloudflare/resources/addressing/address_maps/address_maps.py b/src/cloudflare/resources/addressing/address_maps/address_maps.py index 52862ef3e66..8d42cd84a16 100644 --- a/src/cloudflare/resources/addressing/address_maps/address_maps.py +++ b/src/cloudflare/resources/addressing/address_maps/address_maps.py @@ -49,11 +49,11 @@ AsyncPaginator, make_request_options, ) -from ....types.shared import UnnamedSchemaRef167 from ....types.addressing import ( AddressingAddressMaps, AddressMapGetResponse, AddressMapCreateResponse, + AddressMapDeleteResponse, address_map_edit_params, address_map_create_params, address_map_delete_params, @@ -185,7 +185,7 @@ def delete( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[UnnamedSchemaRef167]: + ) -> Optional[AddressMapDeleteResponse]: """Delete a particular address map owned by the account. An Address Map must be @@ -209,7 +209,7 @@ def delete( if not address_map_id: raise ValueError(f"Expected a non-empty value for `address_map_id` but received {address_map_id!r}") return cast( - Optional[UnnamedSchemaRef167], + Optional[AddressMapDeleteResponse], self._delete( f"/accounts/{account_id}/addressing/address_maps/{address_map_id}", body=maybe_transform(body, address_map_delete_params.AddressMapDeleteParams), @@ -221,7 +221,7 @@ def delete( post_parser=ResultWrapper._unwrapper, ), cast_to=cast( - Any, ResultWrapper[UnnamedSchemaRef167] + Any, ResultWrapper[AddressMapDeleteResponse] ), # Union types cannot be passed in as arguments in the type system ), ) @@ -461,7 +461,7 @@ async def delete( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[UnnamedSchemaRef167]: + ) -> Optional[AddressMapDeleteResponse]: """Delete a particular address map owned by the account. An Address Map must be @@ -485,7 +485,7 @@ async def delete( if not address_map_id: raise ValueError(f"Expected a non-empty value for `address_map_id` but received {address_map_id!r}") return cast( - Optional[UnnamedSchemaRef167], + Optional[AddressMapDeleteResponse], await self._delete( f"/accounts/{account_id}/addressing/address_maps/{address_map_id}", body=await async_maybe_transform(body, address_map_delete_params.AddressMapDeleteParams), @@ -497,7 +497,7 @@ async def delete( post_parser=ResultWrapper._unwrapper, ), cast_to=cast( - Any, ResultWrapper[UnnamedSchemaRef167] + Any, ResultWrapper[AddressMapDeleteResponse] ), # Union types cannot be passed in as arguments in the type system ), ) diff --git a/src/cloudflare/resources/addressing/address_maps/ips.py b/src/cloudflare/resources/addressing/address_maps/ips.py index dabe95c94d9..ff87f190f0b 100644 --- a/src/cloudflare/resources/addressing/address_maps/ips.py +++ b/src/cloudflare/resources/addressing/address_maps/ips.py @@ -23,8 +23,7 @@ from ...._base_client import ( make_request_options, ) -from ....types.shared import UnnamedSchemaRef167 -from ....types.addressing.address_maps import ip_delete_params, ip_update_params +from ....types.addressing.address_maps import IPDeleteResponse, IPUpdateResponse, ip_delete_params, ip_update_params __all__ = ["IPs", "AsyncIPs"] @@ -51,7 +50,7 @@ def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[UnnamedSchemaRef167]: + ) -> Optional[IPUpdateResponse]: """ Add an IP from a prefix owned by the account to a particular address map. @@ -77,7 +76,7 @@ def update( if not ip_address: raise ValueError(f"Expected a non-empty value for `ip_address` but received {ip_address!r}") return cast( - Optional[UnnamedSchemaRef167], + Optional[IPUpdateResponse], self._put( f"/accounts/{account_id}/addressing/address_maps/{address_map_id}/ips/{ip_address}", body=maybe_transform(body, ip_update_params.IPUpdateParams), @@ -89,7 +88,7 @@ def update( post_parser=ResultWrapper._unwrapper, ), cast_to=cast( - Any, ResultWrapper[UnnamedSchemaRef167] + Any, ResultWrapper[IPUpdateResponse] ), # Union types cannot be passed in as arguments in the type system ), ) @@ -107,7 +106,7 @@ def delete( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[UnnamedSchemaRef167]: + ) -> Optional[IPDeleteResponse]: """ Remove an IP from a particular address map. @@ -133,7 +132,7 @@ def delete( if not ip_address: raise ValueError(f"Expected a non-empty value for `ip_address` but received {ip_address!r}") return cast( - Optional[UnnamedSchemaRef167], + Optional[IPDeleteResponse], self._delete( f"/accounts/{account_id}/addressing/address_maps/{address_map_id}/ips/{ip_address}", body=maybe_transform(body, ip_delete_params.IPDeleteParams), @@ -145,7 +144,7 @@ def delete( post_parser=ResultWrapper._unwrapper, ), cast_to=cast( - Any, ResultWrapper[UnnamedSchemaRef167] + Any, ResultWrapper[IPDeleteResponse] ), # Union types cannot be passed in as arguments in the type system ), ) @@ -173,7 +172,7 @@ async def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[UnnamedSchemaRef167]: + ) -> Optional[IPUpdateResponse]: """ Add an IP from a prefix owned by the account to a particular address map. @@ -199,7 +198,7 @@ async def update( if not ip_address: raise ValueError(f"Expected a non-empty value for `ip_address` but received {ip_address!r}") return cast( - Optional[UnnamedSchemaRef167], + Optional[IPUpdateResponse], await self._put( f"/accounts/{account_id}/addressing/address_maps/{address_map_id}/ips/{ip_address}", body=await async_maybe_transform(body, ip_update_params.IPUpdateParams), @@ -211,7 +210,7 @@ async def update( post_parser=ResultWrapper._unwrapper, ), cast_to=cast( - Any, ResultWrapper[UnnamedSchemaRef167] + Any, ResultWrapper[IPUpdateResponse] ), # Union types cannot be passed in as arguments in the type system ), ) @@ -229,7 +228,7 @@ async def delete( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[UnnamedSchemaRef167]: + ) -> Optional[IPDeleteResponse]: """ Remove an IP from a particular address map. @@ -255,7 +254,7 @@ async def delete( if not ip_address: raise ValueError(f"Expected a non-empty value for `ip_address` but received {ip_address!r}") return cast( - Optional[UnnamedSchemaRef167], + Optional[IPDeleteResponse], await self._delete( f"/accounts/{account_id}/addressing/address_maps/{address_map_id}/ips/{ip_address}", body=await async_maybe_transform(body, ip_delete_params.IPDeleteParams), @@ -267,7 +266,7 @@ async def delete( post_parser=ResultWrapper._unwrapper, ), cast_to=cast( - Any, ResultWrapper[UnnamedSchemaRef167] + Any, ResultWrapper[IPDeleteResponse] ), # Union types cannot be passed in as arguments in the type system ), ) diff --git a/src/cloudflare/resources/addressing/address_maps/zones.py b/src/cloudflare/resources/addressing/address_maps/zones.py index 173e95e94e2..6bf140d4d71 100644 --- a/src/cloudflare/resources/addressing/address_maps/zones.py +++ b/src/cloudflare/resources/addressing/address_maps/zones.py @@ -23,8 +23,12 @@ from ...._base_client import ( make_request_options, ) -from ....types.shared import UnnamedSchemaRef167 -from ....types.addressing.address_maps import zone_delete_params, zone_update_params +from ....types.addressing.address_maps import ( + ZoneDeleteResponse, + ZoneUpdateResponse, + zone_delete_params, + zone_update_params, +) __all__ = ["Zones", "AsyncZones"] @@ -51,7 +55,7 @@ def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[UnnamedSchemaRef167]: + ) -> Optional[ZoneUpdateResponse]: """ Add a zone as a member of a particular address map. @@ -77,7 +81,7 @@ def update( if not address_map_id: raise ValueError(f"Expected a non-empty value for `address_map_id` but received {address_map_id!r}") return cast( - Optional[UnnamedSchemaRef167], + Optional[ZoneUpdateResponse], self._put( f"/accounts/{account_id}/addressing/address_maps/{address_map_id}/zones/{zone_id}", body=maybe_transform(body, zone_update_params.ZoneUpdateParams), @@ -89,7 +93,7 @@ def update( post_parser=ResultWrapper._unwrapper, ), cast_to=cast( - Any, ResultWrapper[UnnamedSchemaRef167] + Any, ResultWrapper[ZoneUpdateResponse] ), # Union types cannot be passed in as arguments in the type system ), ) @@ -107,7 +111,7 @@ def delete( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[UnnamedSchemaRef167]: + ) -> Optional[ZoneDeleteResponse]: """ Remove a zone as a member of a particular address map. @@ -133,7 +137,7 @@ def delete( if not address_map_id: raise ValueError(f"Expected a non-empty value for `address_map_id` but received {address_map_id!r}") return cast( - Optional[UnnamedSchemaRef167], + Optional[ZoneDeleteResponse], self._delete( f"/accounts/{account_id}/addressing/address_maps/{address_map_id}/zones/{zone_id}", body=maybe_transform(body, zone_delete_params.ZoneDeleteParams), @@ -145,7 +149,7 @@ def delete( post_parser=ResultWrapper._unwrapper, ), cast_to=cast( - Any, ResultWrapper[UnnamedSchemaRef167] + Any, ResultWrapper[ZoneDeleteResponse] ), # Union types cannot be passed in as arguments in the type system ), ) @@ -173,7 +177,7 @@ async def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[UnnamedSchemaRef167]: + ) -> Optional[ZoneUpdateResponse]: """ Add a zone as a member of a particular address map. @@ -199,7 +203,7 @@ async def update( if not address_map_id: raise ValueError(f"Expected a non-empty value for `address_map_id` but received {address_map_id!r}") return cast( - Optional[UnnamedSchemaRef167], + Optional[ZoneUpdateResponse], await self._put( f"/accounts/{account_id}/addressing/address_maps/{address_map_id}/zones/{zone_id}", body=await async_maybe_transform(body, zone_update_params.ZoneUpdateParams), @@ -211,7 +215,7 @@ async def update( post_parser=ResultWrapper._unwrapper, ), cast_to=cast( - Any, ResultWrapper[UnnamedSchemaRef167] + Any, ResultWrapper[ZoneUpdateResponse] ), # Union types cannot be passed in as arguments in the type system ), ) @@ -229,7 +233,7 @@ async def delete( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[UnnamedSchemaRef167]: + ) -> Optional[ZoneDeleteResponse]: """ Remove a zone as a member of a particular address map. @@ -255,7 +259,7 @@ async def delete( if not address_map_id: raise ValueError(f"Expected a non-empty value for `address_map_id` but received {address_map_id!r}") return cast( - Optional[UnnamedSchemaRef167], + Optional[ZoneDeleteResponse], await self._delete( f"/accounts/{account_id}/addressing/address_maps/{address_map_id}/zones/{zone_id}", body=await async_maybe_transform(body, zone_delete_params.ZoneDeleteParams), @@ -267,7 +271,7 @@ async def delete( post_parser=ResultWrapper._unwrapper, ), cast_to=cast( - Any, ResultWrapper[UnnamedSchemaRef167] + Any, ResultWrapper[ZoneDeleteResponse] ), # Union types cannot be passed in as arguments in the type system ), ) diff --git a/src/cloudflare/resources/addressing/prefixes/prefixes.py b/src/cloudflare/resources/addressing/prefixes/prefixes.py index 174cbaf61a6..ff45c6c4ac5 100644 --- a/src/cloudflare/resources/addressing/prefixes/prefixes.py +++ b/src/cloudflare/resources/addressing/prefixes/prefixes.py @@ -42,8 +42,13 @@ AsyncPaginator, make_request_options, ) -from ....types.shared import UnnamedSchemaRef167 -from ....types.addressing import AddressingIpamPrefixes, prefix_edit_params, prefix_create_params, prefix_delete_params +from ....types.addressing import ( + PrefixDeleteResponse, + AddressingIpamPrefixes, + prefix_edit_params, + prefix_create_params, + prefix_delete_params, +) __all__ = ["Prefixes", "AsyncPrefixes"] @@ -169,7 +174,7 @@ def delete( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[UnnamedSchemaRef167]: + ) -> Optional[PrefixDeleteResponse]: """ Delete an unapproved prefix owned by the account. @@ -191,7 +196,7 @@ def delete( if not prefix_id: raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}") return cast( - Optional[UnnamedSchemaRef167], + Optional[PrefixDeleteResponse], self._delete( f"/accounts/{account_id}/addressing/prefixes/{prefix_id}", body=maybe_transform(body, prefix_delete_params.PrefixDeleteParams), @@ -203,7 +208,7 @@ def delete( post_parser=ResultWrapper._unwrapper, ), cast_to=cast( - Any, ResultWrapper[UnnamedSchemaRef167] + Any, ResultWrapper[PrefixDeleteResponse] ), # Union types cannot be passed in as arguments in the type system ), ) @@ -422,7 +427,7 @@ async def delete( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[UnnamedSchemaRef167]: + ) -> Optional[PrefixDeleteResponse]: """ Delete an unapproved prefix owned by the account. @@ -444,7 +449,7 @@ async def delete( if not prefix_id: raise ValueError(f"Expected a non-empty value for `prefix_id` but received {prefix_id!r}") return cast( - Optional[UnnamedSchemaRef167], + Optional[PrefixDeleteResponse], await self._delete( f"/accounts/{account_id}/addressing/prefixes/{prefix_id}", body=await async_maybe_transform(body, prefix_delete_params.PrefixDeleteParams), @@ -456,7 +461,7 @@ async def delete( post_parser=ResultWrapper._unwrapper, ), cast_to=cast( - Any, ResultWrapper[UnnamedSchemaRef167] + Any, ResultWrapper[PrefixDeleteResponse] ), # Union types cannot be passed in as arguments in the type system ), ) diff --git a/src/cloudflare/resources/alerting/destinations/pagerduty.py b/src/cloudflare/resources/alerting/destinations/pagerduty.py index 3e3658a0a01..d92b8bf9a8d 100644 --- a/src/cloudflare/resources/alerting/destinations/pagerduty.py +++ b/src/cloudflare/resources/alerting/destinations/pagerduty.py @@ -19,8 +19,12 @@ from ...._base_client import ( make_request_options, ) -from ....types.shared import UnnamedSchemaRef167 -from ....types.alerting.destinations import PagerdutyGetResponse, PagerdutyLinkResponse, PagerdutyCreateResponse +from ....types.alerting.destinations import ( + PagerdutyGetResponse, + PagerdutyLinkResponse, + PagerdutyCreateResponse, + PagerdutyDeleteResponse, +) __all__ = ["Pagerduty", "AsyncPagerduty"] @@ -83,7 +87,7 @@ def delete( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[UnnamedSchemaRef167]: + ) -> Optional[PagerdutyDeleteResponse]: """ Deletes all the PagerDuty Services connected to the account. @@ -101,7 +105,7 @@ def delete( if not account_id: raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}") return cast( - Optional[UnnamedSchemaRef167], + Optional[PagerdutyDeleteResponse], self._delete( f"/accounts/{account_id}/alerting/v3/destinations/pagerduty", options=make_request_options( @@ -112,7 +116,7 @@ def delete( post_parser=ResultWrapper._unwrapper, ), cast_to=cast( - Any, ResultWrapper[UnnamedSchemaRef167] + Any, ResultWrapper[PagerdutyDeleteResponse] ), # Union types cannot be passed in as arguments in the type system ), ) @@ -259,7 +263,7 @@ async def delete( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[UnnamedSchemaRef167]: + ) -> Optional[PagerdutyDeleteResponse]: """ Deletes all the PagerDuty Services connected to the account. @@ -277,7 +281,7 @@ async def delete( if not account_id: raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}") return cast( - Optional[UnnamedSchemaRef167], + Optional[PagerdutyDeleteResponse], await self._delete( f"/accounts/{account_id}/alerting/v3/destinations/pagerduty", options=make_request_options( @@ -288,7 +292,7 @@ async def delete( post_parser=ResultWrapper._unwrapper, ), cast_to=cast( - Any, ResultWrapper[UnnamedSchemaRef167] + Any, ResultWrapper[PagerdutyDeleteResponse] ), # Union types cannot be passed in as arguments in the type system ), ) diff --git a/src/cloudflare/resources/alerting/destinations/webhooks.py b/src/cloudflare/resources/alerting/destinations/webhooks.py index e336382ab58..62528f9e741 100644 --- a/src/cloudflare/resources/alerting/destinations/webhooks.py +++ b/src/cloudflare/resources/alerting/destinations/webhooks.py @@ -25,10 +25,10 @@ AsyncPaginator, make_request_options, ) -from ....types.shared import UnnamedSchemaRef167 from ....types.alerting.destinations import ( AlertingWebhooks, WebhookCreateResponse, + WebhookDeleteResponse, WebhookUpdateResponse, webhook_create_params, webhook_update_params, @@ -216,7 +216,7 @@ def delete( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[UnnamedSchemaRef167]: + ) -> Optional[WebhookDeleteResponse]: """ Delete a configured webhook destination. @@ -238,7 +238,7 @@ def delete( if not webhook_id: raise ValueError(f"Expected a non-empty value for `webhook_id` but received {webhook_id!r}") return cast( - Optional[UnnamedSchemaRef167], + Optional[WebhookDeleteResponse], self._delete( f"/accounts/{account_id}/alerting/v3/destinations/webhooks/{webhook_id}", options=make_request_options( @@ -249,7 +249,7 @@ def delete( post_parser=ResultWrapper._unwrapper, ), cast_to=cast( - Any, ResultWrapper[UnnamedSchemaRef167] + Any, ResultWrapper[WebhookDeleteResponse] ), # Union types cannot be passed in as arguments in the type system ), ) @@ -478,7 +478,7 @@ async def delete( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[UnnamedSchemaRef167]: + ) -> Optional[WebhookDeleteResponse]: """ Delete a configured webhook destination. @@ -500,7 +500,7 @@ async def delete( if not webhook_id: raise ValueError(f"Expected a non-empty value for `webhook_id` but received {webhook_id!r}") return cast( - Optional[UnnamedSchemaRef167], + Optional[WebhookDeleteResponse], await self._delete( f"/accounts/{account_id}/alerting/v3/destinations/webhooks/{webhook_id}", options=make_request_options( @@ -511,7 +511,7 @@ async def delete( post_parser=ResultWrapper._unwrapper, ), cast_to=cast( - Any, ResultWrapper[UnnamedSchemaRef167] + Any, ResultWrapper[WebhookDeleteResponse] ), # Union types cannot be passed in as arguments in the type system ), ) diff --git a/src/cloudflare/resources/alerting/policies.py b/src/cloudflare/resources/alerting/policies.py index 441e432faf4..a3372cb90f5 100644 --- a/src/cloudflare/resources/alerting/policies.py +++ b/src/cloudflare/resources/alerting/policies.py @@ -26,10 +26,10 @@ AsyncPaginator, make_request_options, ) -from ...types.shared import UnnamedSchemaRef167 from ...types.alerting import ( AlertingPolicies, PolicyCreateResponse, + PolicyDeleteResponse, PolicyUpdateResponse, policy_create_params, policy_update_params, @@ -358,7 +358,7 @@ def delete( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[UnnamedSchemaRef167]: + ) -> Optional[PolicyDeleteResponse]: """ Delete a Notification policy. @@ -380,7 +380,7 @@ def delete( if not policy_id: raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}") return cast( - Optional[UnnamedSchemaRef167], + Optional[PolicyDeleteResponse], self._delete( f"/accounts/{account_id}/alerting/v3/policies/{policy_id}", options=make_request_options( @@ -391,7 +391,7 @@ def delete( post_parser=ResultWrapper._unwrapper, ), cast_to=cast( - Any, ResultWrapper[UnnamedSchemaRef167] + Any, ResultWrapper[PolicyDeleteResponse] ), # Union types cannot be passed in as arguments in the type system ), ) @@ -761,7 +761,7 @@ async def delete( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[UnnamedSchemaRef167]: + ) -> Optional[PolicyDeleteResponse]: """ Delete a Notification policy. @@ -783,7 +783,7 @@ async def delete( if not policy_id: raise ValueError(f"Expected a non-empty value for `policy_id` but received {policy_id!r}") return cast( - Optional[UnnamedSchemaRef167], + Optional[PolicyDeleteResponse], await self._delete( f"/accounts/{account_id}/alerting/v3/policies/{policy_id}", options=make_request_options( @@ -794,7 +794,7 @@ async def delete( post_parser=ResultWrapper._unwrapper, ), cast_to=cast( - Any, ResultWrapper[UnnamedSchemaRef167] + Any, ResultWrapper[PolicyDeleteResponse] ), # Union types cannot be passed in as arguments in the type system ), ) diff --git a/src/cloudflare/resources/load_balancers/monitors/monitors.py b/src/cloudflare/resources/load_balancers/monitors/monitors.py index f6414d1325f..25e7c0b2c72 100644 --- a/src/cloudflare/resources/load_balancers/monitors/monitors.py +++ b/src/cloudflare/resources/load_balancers/monitors/monitors.py @@ -49,7 +49,7 @@ monitor_delete_params, monitor_update_params, ) -from ....types.user.load_balancers import LoadBalancingMonitor +from ....types.user.load_balancers import Monitor __all__ = ["Monitors", "AsyncMonitors"] @@ -97,7 +97,7 @@ def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingMonitor: + ) -> Monitor: """ Create a configured monitor. @@ -193,7 +193,7 @@ def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingMonitor], ResultWrapper[LoadBalancingMonitor]), + cast_to=cast(Type[Monitor], ResultWrapper[Monitor]), ) def update( @@ -223,7 +223,7 @@ def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingMonitor: + ) -> Monitor: """ Modify a configured monitor. @@ -321,7 +321,7 @@ def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingMonitor], ResultWrapper[LoadBalancingMonitor]), + cast_to=cast(Type[Monitor], ResultWrapper[Monitor]), ) def list( @@ -334,7 +334,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> SyncSinglePage[LoadBalancingMonitor]: + ) -> SyncSinglePage[Monitor]: """ List configured monitors for an account. @@ -353,11 +353,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}/load_balancers/monitors", - page=SyncSinglePage[LoadBalancingMonitor], + page=SyncSinglePage[Monitor], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=LoadBalancingMonitor, + model=Monitor, ) def delete( @@ -431,7 +431,7 @@ def edit( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingMonitor: + ) -> Monitor: """ Apply changes to an existing monitor, overwriting the supplied properties. @@ -529,7 +529,7 @@ def edit( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingMonitor], ResultWrapper[LoadBalancingMonitor]), + cast_to=cast(Type[Monitor], ResultWrapper[Monitor]), ) def get( @@ -543,7 +543,7 @@ def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingMonitor: + ) -> Monitor: """ List a single configured monitor for an account. @@ -571,7 +571,7 @@ def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingMonitor], ResultWrapper[LoadBalancingMonitor]), + cast_to=cast(Type[Monitor], ResultWrapper[Monitor]), ) @@ -618,7 +618,7 @@ async def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingMonitor: + ) -> Monitor: """ Create a configured monitor. @@ -714,7 +714,7 @@ async def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingMonitor], ResultWrapper[LoadBalancingMonitor]), + cast_to=cast(Type[Monitor], ResultWrapper[Monitor]), ) async def update( @@ -744,7 +744,7 @@ async def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingMonitor: + ) -> Monitor: """ Modify a configured monitor. @@ -842,7 +842,7 @@ async def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingMonitor], ResultWrapper[LoadBalancingMonitor]), + cast_to=cast(Type[Monitor], ResultWrapper[Monitor]), ) def list( @@ -855,7 +855,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> AsyncPaginator[LoadBalancingMonitor, AsyncSinglePage[LoadBalancingMonitor]]: + ) -> AsyncPaginator[Monitor, AsyncSinglePage[Monitor]]: """ List configured monitors for an account. @@ -874,11 +874,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}/load_balancers/monitors", - page=AsyncSinglePage[LoadBalancingMonitor], + page=AsyncSinglePage[Monitor], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=LoadBalancingMonitor, + model=Monitor, ) async def delete( @@ -952,7 +952,7 @@ async def edit( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingMonitor: + ) -> Monitor: """ Apply changes to an existing monitor, overwriting the supplied properties. @@ -1050,7 +1050,7 @@ async def edit( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingMonitor], ResultWrapper[LoadBalancingMonitor]), + cast_to=cast(Type[Monitor], ResultWrapper[Monitor]), ) async def get( @@ -1064,7 +1064,7 @@ async def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingMonitor: + ) -> Monitor: """ List a single configured monitor for an account. @@ -1092,7 +1092,7 @@ async def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingMonitor], ResultWrapper[LoadBalancingMonitor]), + cast_to=cast(Type[Monitor], ResultWrapper[Monitor]), ) diff --git a/src/cloudflare/resources/load_balancers/pools/pools.py b/src/cloudflare/resources/load_balancers/pools/pools.py index 18a3e6cd296..92026f9eb25 100644 --- a/src/cloudflare/resources/load_balancers/pools/pools.py +++ b/src/cloudflare/resources/load_balancers/pools/pools.py @@ -50,7 +50,7 @@ pool_delete_params, pool_update_params, ) -from ....types.user.load_balancers import LoadBalancingPool +from ....types.user.load_balancers import Pool __all__ = ["Pools", "AsyncPools"] @@ -94,7 +94,7 @@ def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingPool: + ) -> Pool: """ Create a new pool. @@ -176,7 +176,7 @@ def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingPool], ResultWrapper[LoadBalancingPool]), + cast_to=cast(Type[Pool], ResultWrapper[Pool]), ) def update( @@ -223,7 +223,7 @@ def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingPool: + ) -> Pool: """ Modify a configured pool. @@ -311,7 +311,7 @@ def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingPool], ResultWrapper[LoadBalancingPool]), + cast_to=cast(Type[Pool], ResultWrapper[Pool]), ) def list( @@ -325,7 +325,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> SyncSinglePage[LoadBalancingPool]: + ) -> SyncSinglePage[Pool]: """ List configured pools. @@ -347,7 +347,7 @@ def list( raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}") return self._get_api_list( f"/accounts/{account_id}/load_balancers/pools", - page=SyncSinglePage[LoadBalancingPool], + page=SyncSinglePage[Pool], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -355,7 +355,7 @@ def list( timeout=timeout, query=maybe_transform({"monitor": monitor}, pool_list_params.PoolListParams), ), - model=LoadBalancingPool, + model=Pool, ) def delete( @@ -446,7 +446,7 @@ def edit( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingPool: + ) -> Pool: """ Apply changes to an existing pool, overwriting the supplied properties. @@ -534,7 +534,7 @@ def edit( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingPool], ResultWrapper[LoadBalancingPool]), + cast_to=cast(Type[Pool], ResultWrapper[Pool]), ) def get( @@ -548,7 +548,7 @@ def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingPool: + ) -> Pool: """ Fetch a single configured pool. @@ -576,7 +576,7 @@ def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingPool], ResultWrapper[LoadBalancingPool]), + cast_to=cast(Type[Pool], ResultWrapper[Pool]), ) @@ -619,7 +619,7 @@ async def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingPool: + ) -> Pool: """ Create a new pool. @@ -701,7 +701,7 @@ async def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingPool], ResultWrapper[LoadBalancingPool]), + cast_to=cast(Type[Pool], ResultWrapper[Pool]), ) async def update( @@ -748,7 +748,7 @@ async def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingPool: + ) -> Pool: """ Modify a configured pool. @@ -836,7 +836,7 @@ async def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingPool], ResultWrapper[LoadBalancingPool]), + cast_to=cast(Type[Pool], ResultWrapper[Pool]), ) def list( @@ -850,7 +850,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> AsyncPaginator[LoadBalancingPool, AsyncSinglePage[LoadBalancingPool]]: + ) -> AsyncPaginator[Pool, AsyncSinglePage[Pool]]: """ List configured pools. @@ -872,7 +872,7 @@ def list( raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}") return self._get_api_list( f"/accounts/{account_id}/load_balancers/pools", - page=AsyncSinglePage[LoadBalancingPool], + page=AsyncSinglePage[Pool], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -880,7 +880,7 @@ def list( timeout=timeout, query=maybe_transform({"monitor": monitor}, pool_list_params.PoolListParams), ), - model=LoadBalancingPool, + model=Pool, ) async def delete( @@ -971,7 +971,7 @@ async def edit( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingPool: + ) -> Pool: """ Apply changes to an existing pool, overwriting the supplied properties. @@ -1059,7 +1059,7 @@ async def edit( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingPool], ResultWrapper[LoadBalancingPool]), + cast_to=cast(Type[Pool], ResultWrapper[Pool]), ) async def get( @@ -1073,7 +1073,7 @@ async def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingPool: + ) -> Pool: """ Fetch a single configured pool. @@ -1101,7 +1101,7 @@ async def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingPool], ResultWrapper[LoadBalancingPool]), + cast_to=cast(Type[Pool], ResultWrapper[Pool]), ) diff --git a/src/cloudflare/resources/queues/consumers.py b/src/cloudflare/resources/queues/consumers.py index ace7d75222e..e860164b69c 100644 --- a/src/cloudflare/resources/queues/consumers.py +++ b/src/cloudflare/resources/queues/consumers.py @@ -26,12 +26,12 @@ from ...types.queues import ( ConsumerGetResponse, ConsumerCreateResponse, + ConsumerDeleteResponse, ConsumerUpdateResponse, consumer_create_params, consumer_delete_params, consumer_update_params, ) -from ...types.shared import UnnamedSchemaRef167 __all__ = ["Consumers", "AsyncConsumers"] @@ -155,7 +155,7 @@ def delete( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[UnnamedSchemaRef167]: + ) -> Optional[ConsumerDeleteResponse]: """ Deletes the consumer for a queue. @@ -181,7 +181,7 @@ def delete( if not consumer_id: raise ValueError(f"Expected a non-empty value for `consumer_id` but received {consumer_id!r}") return cast( - Optional[UnnamedSchemaRef167], + Optional[ConsumerDeleteResponse], self._delete( f"/accounts/{account_id}/queues/{queue_id}/consumers/{consumer_id}", body=maybe_transform(body, consumer_delete_params.ConsumerDeleteParams), @@ -193,7 +193,7 @@ def delete( post_parser=ResultWrapper._unwrapper, ), cast_to=cast( - Any, ResultWrapper[UnnamedSchemaRef167] + Any, ResultWrapper[ConsumerDeleteResponse] ), # Union types cannot be passed in as arguments in the type system ), ) @@ -362,7 +362,7 @@ async def delete( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[UnnamedSchemaRef167]: + ) -> Optional[ConsumerDeleteResponse]: """ Deletes the consumer for a queue. @@ -388,7 +388,7 @@ async def delete( if not consumer_id: raise ValueError(f"Expected a non-empty value for `consumer_id` but received {consumer_id!r}") return cast( - Optional[UnnamedSchemaRef167], + Optional[ConsumerDeleteResponse], await self._delete( f"/accounts/{account_id}/queues/{queue_id}/consumers/{consumer_id}", body=await async_maybe_transform(body, consumer_delete_params.ConsumerDeleteParams), @@ -400,7 +400,7 @@ async def delete( post_parser=ResultWrapper._unwrapper, ), cast_to=cast( - Any, ResultWrapper[UnnamedSchemaRef167] + Any, ResultWrapper[ConsumerDeleteResponse] ), # Union types cannot be passed in as arguments in the type system ), ) diff --git a/src/cloudflare/resources/queues/queues.py b/src/cloudflare/resources/queues/queues.py index 4f424b72b44..4cc9fd64ac5 100644 --- a/src/cloudflare/resources/queues/queues.py +++ b/src/cloudflare/resources/queues/queues.py @@ -10,6 +10,7 @@ QueueGetResponse, QueueListResponse, QueueCreateResponse, + QueueDeleteResponse, QueueUpdateResponse, queue_create_params, queue_delete_params, @@ -48,7 +49,6 @@ from ..._base_client import ( make_request_options, ) -from ...types.shared import UnnamedSchemaRef167 __all__ = ["Queues", "AsyncQueues"] @@ -208,7 +208,7 @@ def delete( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[UnnamedSchemaRef167]: + ) -> Optional[QueueDeleteResponse]: """ Deletes a queue. @@ -230,7 +230,7 @@ def delete( if not queue_id: raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}") return cast( - Optional[UnnamedSchemaRef167], + Optional[QueueDeleteResponse], self._delete( f"/accounts/{account_id}/queues/{queue_id}", body=maybe_transform(body, queue_delete_params.QueueDeleteParams), @@ -242,7 +242,7 @@ def delete( post_parser=ResultWrapper._unwrapper, ), cast_to=cast( - Any, ResultWrapper[UnnamedSchemaRef167] + Any, ResultWrapper[QueueDeleteResponse] ), # Union types cannot be passed in as arguments in the type system ), ) @@ -447,7 +447,7 @@ async def delete( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[UnnamedSchemaRef167]: + ) -> Optional[QueueDeleteResponse]: """ Deletes a queue. @@ -469,7 +469,7 @@ async def delete( if not queue_id: raise ValueError(f"Expected a non-empty value for `queue_id` but received {queue_id!r}") return cast( - Optional[UnnamedSchemaRef167], + Optional[QueueDeleteResponse], await self._delete( f"/accounts/{account_id}/queues/{queue_id}", body=await async_maybe_transform(body, queue_delete_params.QueueDeleteParams), @@ -481,7 +481,7 @@ async def delete( post_parser=ResultWrapper._unwrapper, ), cast_to=cast( - Any, ResultWrapper[UnnamedSchemaRef167] + Any, ResultWrapper[QueueDeleteResponse] ), # Union types cannot be passed in as arguments in the type system ), ) diff --git a/src/cloudflare/resources/rulesets/rules.py b/src/cloudflare/resources/rulesets/rules.py index b96832e395e..5c4a222f804 100644 --- a/src/cloudflare/resources/rulesets/rules.py +++ b/src/cloudflare/resources/rulesets/rules.py @@ -7,7 +7,7 @@ import httpx -from ...types import shared_params +from ...types import LoggingParam from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven from ..._utils import ( required_args, @@ -59,7 +59,7 @@ def create( description: str | NotGiven = NOT_GIVEN, enabled: bool | NotGiven = NOT_GIVEN, expression: str | NotGiven = NOT_GIVEN, - logging: shared_params.Logging | NotGiven = NOT_GIVEN, + logging: LoggingParam | NotGiven = NOT_GIVEN, ref: str | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. @@ -119,7 +119,7 @@ def create( description: str | NotGiven = NOT_GIVEN, enabled: bool | NotGiven = NOT_GIVEN, expression: str | NotGiven = NOT_GIVEN, - logging: shared_params.Logging | NotGiven = NOT_GIVEN, + logging: LoggingParam | NotGiven = NOT_GIVEN, ref: str | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. @@ -179,7 +179,7 @@ def create( description: str | NotGiven = NOT_GIVEN, enabled: bool | NotGiven = NOT_GIVEN, expression: str | NotGiven = NOT_GIVEN, - logging: shared_params.Logging | NotGiven = NOT_GIVEN, + logging: LoggingParam | NotGiven = NOT_GIVEN, ref: str | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. @@ -239,7 +239,7 @@ def create( description: str | NotGiven = NOT_GIVEN, enabled: bool | NotGiven = NOT_GIVEN, expression: str | NotGiven = NOT_GIVEN, - logging: shared_params.Logging | NotGiven = NOT_GIVEN, + logging: LoggingParam | NotGiven = NOT_GIVEN, ref: str | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. @@ -302,7 +302,7 @@ def create( description: str | NotGiven = NOT_GIVEN, enabled: bool | NotGiven = NOT_GIVEN, expression: str | NotGiven = NOT_GIVEN, - logging: shared_params.Logging | NotGiven = NOT_GIVEN, + logging: LoggingParam | NotGiven = NOT_GIVEN, ref: str | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. @@ -432,7 +432,7 @@ def edit( description: str | NotGiven = NOT_GIVEN, enabled: bool | NotGiven = NOT_GIVEN, expression: str | NotGiven = NOT_GIVEN, - logging: shared_params.Logging | NotGiven = NOT_GIVEN, + logging: LoggingParam | NotGiven = NOT_GIVEN, ref: str | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. @@ -493,7 +493,7 @@ def edit( description: str | NotGiven = NOT_GIVEN, enabled: bool | NotGiven = NOT_GIVEN, expression: str | NotGiven = NOT_GIVEN, - logging: shared_params.Logging | NotGiven = NOT_GIVEN, + logging: LoggingParam | NotGiven = NOT_GIVEN, ref: str | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. @@ -554,7 +554,7 @@ def edit( description: str | NotGiven = NOT_GIVEN, enabled: bool | NotGiven = NOT_GIVEN, expression: str | NotGiven = NOT_GIVEN, - logging: shared_params.Logging | NotGiven = NOT_GIVEN, + logging: LoggingParam | NotGiven = NOT_GIVEN, ref: str | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. @@ -615,7 +615,7 @@ def edit( description: str | NotGiven = NOT_GIVEN, enabled: bool | NotGiven = NOT_GIVEN, expression: str | NotGiven = NOT_GIVEN, - logging: shared_params.Logging | NotGiven = NOT_GIVEN, + logging: LoggingParam | NotGiven = NOT_GIVEN, ref: str | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. @@ -680,7 +680,7 @@ def edit( description: str | NotGiven = NOT_GIVEN, enabled: bool | NotGiven = NOT_GIVEN, expression: str | NotGiven = NOT_GIVEN, - logging: shared_params.Logging | NotGiven = NOT_GIVEN, + logging: LoggingParam | NotGiven = NOT_GIVEN, ref: str | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. @@ -756,7 +756,7 @@ async def create( description: str | NotGiven = NOT_GIVEN, enabled: bool | NotGiven = NOT_GIVEN, expression: str | NotGiven = NOT_GIVEN, - logging: shared_params.Logging | NotGiven = NOT_GIVEN, + logging: LoggingParam | NotGiven = NOT_GIVEN, ref: str | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. @@ -816,7 +816,7 @@ async def create( description: str | NotGiven = NOT_GIVEN, enabled: bool | NotGiven = NOT_GIVEN, expression: str | NotGiven = NOT_GIVEN, - logging: shared_params.Logging | NotGiven = NOT_GIVEN, + logging: LoggingParam | NotGiven = NOT_GIVEN, ref: str | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. @@ -876,7 +876,7 @@ async def create( description: str | NotGiven = NOT_GIVEN, enabled: bool | NotGiven = NOT_GIVEN, expression: str | NotGiven = NOT_GIVEN, - logging: shared_params.Logging | NotGiven = NOT_GIVEN, + logging: LoggingParam | NotGiven = NOT_GIVEN, ref: str | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. @@ -936,7 +936,7 @@ async def create( description: str | NotGiven = NOT_GIVEN, enabled: bool | NotGiven = NOT_GIVEN, expression: str | NotGiven = NOT_GIVEN, - logging: shared_params.Logging | NotGiven = NOT_GIVEN, + logging: LoggingParam | NotGiven = NOT_GIVEN, ref: str | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. @@ -999,7 +999,7 @@ async def create( description: str | NotGiven = NOT_GIVEN, enabled: bool | NotGiven = NOT_GIVEN, expression: str | NotGiven = NOT_GIVEN, - logging: shared_params.Logging | NotGiven = NOT_GIVEN, + logging: LoggingParam | NotGiven = NOT_GIVEN, ref: str | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. @@ -1129,7 +1129,7 @@ async def edit( description: str | NotGiven = NOT_GIVEN, enabled: bool | NotGiven = NOT_GIVEN, expression: str | NotGiven = NOT_GIVEN, - logging: shared_params.Logging | NotGiven = NOT_GIVEN, + logging: LoggingParam | NotGiven = NOT_GIVEN, ref: str | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. @@ -1190,7 +1190,7 @@ async def edit( description: str | NotGiven = NOT_GIVEN, enabled: bool | NotGiven = NOT_GIVEN, expression: str | NotGiven = NOT_GIVEN, - logging: shared_params.Logging | NotGiven = NOT_GIVEN, + logging: LoggingParam | NotGiven = NOT_GIVEN, ref: str | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. @@ -1251,7 +1251,7 @@ async def edit( description: str | NotGiven = NOT_GIVEN, enabled: bool | NotGiven = NOT_GIVEN, expression: str | NotGiven = NOT_GIVEN, - logging: shared_params.Logging | NotGiven = NOT_GIVEN, + logging: LoggingParam | NotGiven = NOT_GIVEN, ref: str | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. @@ -1312,7 +1312,7 @@ async def edit( description: str | NotGiven = NOT_GIVEN, enabled: bool | NotGiven = NOT_GIVEN, expression: str | NotGiven = NOT_GIVEN, - logging: shared_params.Logging | NotGiven = NOT_GIVEN, + logging: LoggingParam | NotGiven = NOT_GIVEN, ref: str | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. @@ -1377,7 +1377,7 @@ async def edit( description: str | NotGiven = NOT_GIVEN, enabled: bool | NotGiven = NOT_GIVEN, expression: str | NotGiven = NOT_GIVEN, - logging: shared_params.Logging | NotGiven = NOT_GIVEN, + logging: LoggingParam | NotGiven = NOT_GIVEN, ref: str | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. diff --git a/src/cloudflare/resources/user/firewall/access_rules.py b/src/cloudflare/resources/user/firewall/access_rules.py index 55c4cb7ec9b..e8da8412b4b 100644 --- a/src/cloudflare/resources/user/firewall/access_rules.py +++ b/src/cloudflare/resources/user/firewall/access_rules.py @@ -27,7 +27,7 @@ make_request_options, ) from ....types.user.firewall import ( - FirewallRule, + AccessRule, AccessRuleDeleteResponse, access_rule_edit_params, access_rule_list_params, @@ -59,7 +59,7 @@ def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[FirewallRule]: + ) -> Optional[AccessRule]: """ Creates a new IP Access rule for all zones owned by the current user. @@ -98,7 +98,7 @@ def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Optional[FirewallRule]], ResultWrapper[FirewallRule]), + cast_to=cast(Type[Optional[AccessRule]], ResultWrapper[AccessRule]), ) def list( @@ -116,7 +116,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> SyncV4PagePaginationArray[FirewallRule]: + ) -> SyncV4PagePaginationArray[AccessRule]: """Fetches IP Access rules of the user. You can filter the results using several @@ -141,7 +141,7 @@ def list( """ return self._get_api_list( "/user/firewall/access_rules/rules", - page=SyncV4PagePaginationArray[FirewallRule], + page=SyncV4PagePaginationArray[AccessRule], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -159,7 +159,7 @@ def list( access_rule_list_params.AccessRuleListParams, ), ), - model=FirewallRule, + model=AccessRule, ) def delete( @@ -217,7 +217,7 @@ def edit( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[FirewallRule]: + ) -> Optional[AccessRule]: """Updates an IP Access rule defined at the user level. You can only update the @@ -256,7 +256,7 @@ def edit( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Optional[FirewallRule]], ResultWrapper[FirewallRule]), + cast_to=cast(Type[Optional[AccessRule]], ResultWrapper[AccessRule]), ) @@ -281,7 +281,7 @@ async def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[FirewallRule]: + ) -> Optional[AccessRule]: """ Creates a new IP Access rule for all zones owned by the current user. @@ -320,7 +320,7 @@ async def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Optional[FirewallRule]], ResultWrapper[FirewallRule]), + cast_to=cast(Type[Optional[AccessRule]], ResultWrapper[AccessRule]), ) def list( @@ -338,7 +338,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> AsyncPaginator[FirewallRule, AsyncV4PagePaginationArray[FirewallRule]]: + ) -> AsyncPaginator[AccessRule, AsyncV4PagePaginationArray[AccessRule]]: """Fetches IP Access rules of the user. You can filter the results using several @@ -363,7 +363,7 @@ def list( """ return self._get_api_list( "/user/firewall/access_rules/rules", - page=AsyncV4PagePaginationArray[FirewallRule], + page=AsyncV4PagePaginationArray[AccessRule], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -381,7 +381,7 @@ def list( access_rule_list_params.AccessRuleListParams, ), ), - model=FirewallRule, + model=AccessRule, ) async def delete( @@ -439,7 +439,7 @@ async def edit( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[FirewallRule]: + ) -> Optional[AccessRule]: """Updates an IP Access rule defined at the user level. You can only update the @@ -478,7 +478,7 @@ async def edit( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Optional[FirewallRule]], ResultWrapper[FirewallRule]), + cast_to=cast(Type[Optional[AccessRule]], ResultWrapper[AccessRule]), ) diff --git a/src/cloudflare/resources/user/load_balancers/monitors.py b/src/cloudflare/resources/user/load_balancers/monitors.py index 2b2c1113800..9ab21920c92 100644 --- a/src/cloudflare/resources/user/load_balancers/monitors.py +++ b/src/cloudflare/resources/user/load_balancers/monitors.py @@ -27,7 +27,7 @@ make_request_options, ) from ....types.user.load_balancers import ( - LoadBalancingMonitor, + Monitor, MonitorDeleteResponse, MonitorPreviewResponse, MonitorReferencesResponse, @@ -75,7 +75,7 @@ def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingMonitor: + ) -> Monitor: """ Create a configured monitor. @@ -167,7 +167,7 @@ def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingMonitor], ResultWrapper[LoadBalancingMonitor]), + cast_to=cast(Type[Monitor], ResultWrapper[Monitor]), ) def update( @@ -196,7 +196,7 @@ def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingMonitor: + ) -> Monitor: """ Modify a configured monitor. @@ -290,7 +290,7 @@ def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingMonitor], ResultWrapper[LoadBalancingMonitor]), + cast_to=cast(Type[Monitor], ResultWrapper[Monitor]), ) def list( @@ -302,15 +302,15 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> SyncSinglePage[LoadBalancingMonitor]: + ) -> SyncSinglePage[Monitor]: """List configured monitors for a user.""" return self._get_api_list( "/user/load_balancers/monitors", - page=SyncSinglePage[LoadBalancingMonitor], + page=SyncSinglePage[Monitor], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=LoadBalancingMonitor, + model=Monitor, ) def delete( @@ -378,7 +378,7 @@ def edit( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingMonitor: + ) -> Monitor: """ Apply changes to an existing monitor, overwriting the supplied properties. @@ -472,7 +472,7 @@ def edit( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingMonitor], ResultWrapper[LoadBalancingMonitor]), + cast_to=cast(Type[Monitor], ResultWrapper[Monitor]), ) def get( @@ -485,7 +485,7 @@ def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingMonitor: + ) -> Monitor: """ List a single configured monitor for a user. @@ -509,7 +509,7 @@ def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingMonitor], ResultWrapper[LoadBalancingMonitor]), + cast_to=cast(Type[Monitor], ResultWrapper[Monitor]), ) def preview( @@ -709,7 +709,7 @@ async def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingMonitor: + ) -> Monitor: """ Create a configured monitor. @@ -801,7 +801,7 @@ async def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingMonitor], ResultWrapper[LoadBalancingMonitor]), + cast_to=cast(Type[Monitor], ResultWrapper[Monitor]), ) async def update( @@ -830,7 +830,7 @@ async def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingMonitor: + ) -> Monitor: """ Modify a configured monitor. @@ -924,7 +924,7 @@ async def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingMonitor], ResultWrapper[LoadBalancingMonitor]), + cast_to=cast(Type[Monitor], ResultWrapper[Monitor]), ) def list( @@ -936,15 +936,15 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> AsyncPaginator[LoadBalancingMonitor, AsyncSinglePage[LoadBalancingMonitor]]: + ) -> AsyncPaginator[Monitor, AsyncSinglePage[Monitor]]: """List configured monitors for a user.""" return self._get_api_list( "/user/load_balancers/monitors", - page=AsyncSinglePage[LoadBalancingMonitor], + page=AsyncSinglePage[Monitor], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=LoadBalancingMonitor, + model=Monitor, ) async def delete( @@ -1012,7 +1012,7 @@ async def edit( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingMonitor: + ) -> Monitor: """ Apply changes to an existing monitor, overwriting the supplied properties. @@ -1106,7 +1106,7 @@ async def edit( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingMonitor], ResultWrapper[LoadBalancingMonitor]), + cast_to=cast(Type[Monitor], ResultWrapper[Monitor]), ) async def get( @@ -1119,7 +1119,7 @@ async def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingMonitor: + ) -> Monitor: """ List a single configured monitor for a user. @@ -1143,7 +1143,7 @@ async def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingMonitor], ResultWrapper[LoadBalancingMonitor]), + cast_to=cast(Type[Monitor], ResultWrapper[Monitor]), ) async def preview( diff --git a/src/cloudflare/resources/user/load_balancers/pools.py b/src/cloudflare/resources/user/load_balancers/pools.py index 52b1e647562..fa7c933d28e 100644 --- a/src/cloudflare/resources/user/load_balancers/pools.py +++ b/src/cloudflare/resources/user/load_balancers/pools.py @@ -27,7 +27,7 @@ make_request_options, ) from ....types.user.load_balancers import ( - LoadBalancingPool, + Pool, PoolDeleteResponse, PoolHealthResponse, PoolPreviewResponse, @@ -94,7 +94,7 @@ def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingPool: + ) -> Pool: """Create a new pool. Args: @@ -177,7 +177,7 @@ def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingPool], ResultWrapper[LoadBalancingPool]), + cast_to=cast(Type[Pool], ResultWrapper[Pool]), ) def update( @@ -223,7 +223,7 @@ def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingPool: + ) -> Pool: """Modify a configured pool. Args: @@ -308,7 +308,7 @@ def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingPool], ResultWrapper[LoadBalancingPool]), + cast_to=cast(Type[Pool], ResultWrapper[Pool]), ) def list( @@ -321,7 +321,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> SyncSinglePage[LoadBalancingPool]: + ) -> SyncSinglePage[Pool]: """ List configured pools. @@ -339,7 +339,7 @@ def list( """ return self._get_api_list( "/user/load_balancers/pools", - page=SyncSinglePage[LoadBalancingPool], + page=SyncSinglePage[Pool], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -347,7 +347,7 @@ def list( timeout=timeout, query=maybe_transform({"monitor": monitor}, pool_list_params.PoolListParams), ), - model=LoadBalancingPool, + model=Pool, ) def delete( @@ -432,7 +432,7 @@ def edit( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingPool: + ) -> Pool: """ Apply changes to an existing pool, overwriting the supplied properties. @@ -516,7 +516,7 @@ def edit( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingPool], ResultWrapper[LoadBalancingPool]), + cast_to=cast(Type[Pool], ResultWrapper[Pool]), ) def get( @@ -529,7 +529,7 @@ def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingPool: + ) -> Pool: """ Fetch a single configured pool. @@ -553,7 +553,7 @@ def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingPool], ResultWrapper[LoadBalancingPool]), + cast_to=cast(Type[Pool], ResultWrapper[Pool]), ) def health( @@ -812,7 +812,7 @@ async def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingPool: + ) -> Pool: """Create a new pool. Args: @@ -895,7 +895,7 @@ async def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingPool], ResultWrapper[LoadBalancingPool]), + cast_to=cast(Type[Pool], ResultWrapper[Pool]), ) async def update( @@ -941,7 +941,7 @@ async def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingPool: + ) -> Pool: """Modify a configured pool. Args: @@ -1026,7 +1026,7 @@ async def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingPool], ResultWrapper[LoadBalancingPool]), + cast_to=cast(Type[Pool], ResultWrapper[Pool]), ) def list( @@ -1039,7 +1039,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> AsyncPaginator[LoadBalancingPool, AsyncSinglePage[LoadBalancingPool]]: + ) -> AsyncPaginator[Pool, AsyncSinglePage[Pool]]: """ List configured pools. @@ -1057,7 +1057,7 @@ def list( """ return self._get_api_list( "/user/load_balancers/pools", - page=AsyncSinglePage[LoadBalancingPool], + page=AsyncSinglePage[Pool], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -1065,7 +1065,7 @@ def list( timeout=timeout, query=maybe_transform({"monitor": monitor}, pool_list_params.PoolListParams), ), - model=LoadBalancingPool, + model=Pool, ) async def delete( @@ -1150,7 +1150,7 @@ async def edit( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingPool: + ) -> Pool: """ Apply changes to an existing pool, overwriting the supplied properties. @@ -1234,7 +1234,7 @@ async def edit( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingPool], ResultWrapper[LoadBalancingPool]), + cast_to=cast(Type[Pool], ResultWrapper[Pool]), ) async def get( @@ -1247,7 +1247,7 @@ async def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> LoadBalancingPool: + ) -> Pool: """ Fetch a single configured pool. @@ -1271,7 +1271,7 @@ async def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[LoadBalancingPool], ResultWrapper[LoadBalancingPool]), + cast_to=cast(Type[Pool], ResultWrapper[Pool]), ) async def health( diff --git a/src/cloudflare/resources/zones/custom_nameservers.py b/src/cloudflare/resources/zones/custom_nameservers.py index ac605325391..f5a2db1748d 100644 --- a/src/cloudflare/resources/zones/custom_nameservers.py +++ b/src/cloudflare/resources/zones/custom_nameservers.py @@ -20,11 +20,10 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.zones import CustomNameserverUpdateResponse, custom_nameserver_update_params +from ...types.zones import CustomNameserverGetResponse, CustomNameserverUpdateResponse, custom_nameserver_update_params from ..._base_client import ( make_request_options, ) -from ...types.shared import UnnamedSchemaRef167 __all__ = ["CustomNameservers", "AsyncCustomNameservers"] @@ -109,7 +108,7 @@ def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[UnnamedSchemaRef167]: + ) -> Optional[CustomNameserverGetResponse]: """ Get metadata for account-level custom nameservers on a zone. @@ -127,7 +126,7 @@ def get( if not zone_id: raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}") return cast( - Optional[UnnamedSchemaRef167], + Optional[CustomNameserverGetResponse], self._get( f"/zones/{zone_id}/custom_ns", options=make_request_options( @@ -138,7 +137,7 @@ def get( post_parser=ResultWrapper._unwrapper, ), cast_to=cast( - Any, ResultWrapper[UnnamedSchemaRef167] + Any, ResultWrapper[CustomNameserverGetResponse] ), # Union types cannot be passed in as arguments in the type system ), ) @@ -224,7 +223,7 @@ async def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[UnnamedSchemaRef167]: + ) -> Optional[CustomNameserverGetResponse]: """ Get metadata for account-level custom nameservers on a zone. @@ -242,7 +241,7 @@ async def get( if not zone_id: raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}") return cast( - Optional[UnnamedSchemaRef167], + Optional[CustomNameserverGetResponse], await self._get( f"/zones/{zone_id}/custom_ns", options=make_request_options( @@ -253,7 +252,7 @@ async def get( post_parser=ResultWrapper._unwrapper, ), cast_to=cast( - Any, ResultWrapper[UnnamedSchemaRef167] + Any, ResultWrapper[CustomNameserverGetResponse] ), # Union types cannot be passed in as arguments in the type system ), ) diff --git a/src/cloudflare/types/__init__.py b/src/cloudflare/types/__init__.py index b257d75b751..f3b58327d8d 100644 --- a/src/cloudflare/types/__init__.py +++ b/src/cloudflare/types/__init__.py @@ -6,7 +6,6 @@ from .zone import Zone as Zone from .dnssec import DNSSEC as DNSSEC from .shared import ( - Logging as Logging, ErrorData as ErrorData, ResponseInfo as ResponseInfo, UnnamedSchemaRef2 as UnnamedSchemaRef2, @@ -122,13 +121,13 @@ UnnamedSchemaRef161 as UnnamedSchemaRef161, UnnamedSchemaRef162 as UnnamedSchemaRef162, UnnamedSchemaRef163 as UnnamedSchemaRef163, - UnnamedSchemaRef167 as UnnamedSchemaRef167, UnnamedSchemaRef169 as UnnamedSchemaRef169, UnnamedSchemaRef170 as UnnamedSchemaRef170, UnnamedSchemaRef171 as UnnamedSchemaRef171, UnnamedSchemaRef173 as UnnamedSchemaRef173, ) from .account import Account as Account +from .logging import Logging as Logging from .snippet import Snippet as Snippet from .calls_app import CallsApp as CallsApp from .membership import Membership as Membership @@ -136,6 +135,7 @@ from .jdcloud_ips import JDCloudIPs as JDCloudIPs from .waiting_room import WaitingRoom as WaitingRoom from .load_balancer import LoadBalancer as LoadBalancer +from .logging_param import LoggingParam as LoggingParam from .stream_videos import StreamVideos as StreamVideos from .ip_list_params import IPListParams as IPListParams from .zones_pagerule import ZonesPagerule as ZonesPagerule @@ -190,6 +190,7 @@ from .origin_ca_certificate import OriginCACertificate as OriginCACertificate from .pagerule_get_response import PageruleGetResponse as PageruleGetResponse from .queue_create_response import QueueCreateResponse as QueueCreateResponse +from .queue_delete_response import QueueDeleteResponse as QueueDeleteResponse from .queue_update_response import QueueUpdateResponse as QueueUpdateResponse from .ruleset_create_params import RulesetCreateParams as RulesetCreateParams from .ruleset_list_response import RulesetListResponse as RulesetListResponse diff --git a/src/cloudflare/types/addressing/__init__.py b/src/cloudflare/types/addressing/__init__.py index 506808a48cb..e3f50f14a63 100644 --- a/src/cloudflare/types/addressing/__init__.py +++ b/src/cloudflare/types/addressing/__init__.py @@ -6,6 +6,7 @@ from .prefix_create_params import PrefixCreateParams as PrefixCreateParams from .prefix_delete_params import PrefixDeleteParams as PrefixDeleteParams from .service_list_response import ServiceListResponse as ServiceListResponse +from .prefix_delete_response import PrefixDeleteResponse as PrefixDeleteResponse from .address_map_edit_params import AddressMapEditParams as AddressMapEditParams from .addressing_address_maps import AddressingAddressMaps as AddressingAddressMaps from .address_map_get_response import AddressMapGetResponse as AddressMapGetResponse @@ -14,4 +15,5 @@ from .address_map_delete_params import AddressMapDeleteParams as AddressMapDeleteParams from .loa_document_create_params import LOADocumentCreateParams as LOADocumentCreateParams from .address_map_create_response import AddressMapCreateResponse as AddressMapCreateResponse +from .address_map_delete_response import AddressMapDeleteResponse as AddressMapDeleteResponse from .loa_document_create_response import LOADocumentCreateResponse as LOADocumentCreateResponse diff --git a/src/cloudflare/types/addressing/address_map_delete_response.py b/src/cloudflare/types/addressing/address_map_delete_response.py new file mode 100644 index 00000000000..57b879481e2 --- /dev/null +++ b/src/cloudflare/types/addressing/address_map_delete_response.py @@ -0,0 +1,7 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import List, Union + +__all__ = ["AddressMapDeleteResponse"] + +AddressMapDeleteResponse = Union[List[object], str, object, None] diff --git a/src/cloudflare/types/addressing/address_maps/__init__.py b/src/cloudflare/types/addressing/address_maps/__init__.py index a9d27b6bf97..3ec4e9eda25 100644 --- a/src/cloudflare/types/addressing/address_maps/__init__.py +++ b/src/cloudflare/types/addressing/address_maps/__init__.py @@ -4,7 +4,13 @@ from .ip_delete_params import IPDeleteParams as IPDeleteParams from .ip_update_params import IPUpdateParams as IPUpdateParams +from .ip_delete_response import IPDeleteResponse as IPDeleteResponse +from .ip_update_response import IPUpdateResponse as IPUpdateResponse from .zone_delete_params import ZoneDeleteParams as ZoneDeleteParams from .zone_update_params import ZoneUpdateParams as ZoneUpdateParams +from .zone_delete_response import ZoneDeleteResponse as ZoneDeleteResponse +from .zone_update_response import ZoneUpdateResponse as ZoneUpdateResponse from .account_delete_params import AccountDeleteParams as AccountDeleteParams from .account_update_params import AccountUpdateParams as AccountUpdateParams +from .account_delete_response import AccountDeleteResponse as AccountDeleteResponse +from .account_update_response import AccountUpdateResponse as AccountUpdateResponse diff --git a/src/cloudflare/types/addressing/address_maps/account_delete_response.py b/src/cloudflare/types/addressing/address_maps/account_delete_response.py new file mode 100644 index 00000000000..3ddf76cafe9 --- /dev/null +++ b/src/cloudflare/types/addressing/address_maps/account_delete_response.py @@ -0,0 +1,7 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import List, Union + +__all__ = ["AccountDeleteResponse"] + +AccountDeleteResponse = Union[List[object], str, object, None] diff --git a/src/cloudflare/types/addressing/address_maps/account_update_response.py b/src/cloudflare/types/addressing/address_maps/account_update_response.py new file mode 100644 index 00000000000..53831e97698 --- /dev/null +++ b/src/cloudflare/types/addressing/address_maps/account_update_response.py @@ -0,0 +1,7 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import List, Union + +__all__ = ["AccountUpdateResponse"] + +AccountUpdateResponse = Union[List[object], str, object, None] diff --git a/src/cloudflare/types/shared/unnamed_schema_ref_167.py b/src/cloudflare/types/addressing/address_maps/ip_delete_response.py similarity index 55% rename from src/cloudflare/types/shared/unnamed_schema_ref_167.py rename to src/cloudflare/types/addressing/address_maps/ip_delete_response.py index 734862839db..9cb4b12b353 100644 --- a/src/cloudflare/types/shared/unnamed_schema_ref_167.py +++ b/src/cloudflare/types/addressing/address_maps/ip_delete_response.py @@ -2,6 +2,6 @@ from typing import List, Union -__all__ = ["UnnamedSchemaRef167"] +__all__ = ["IPDeleteResponse"] -UnnamedSchemaRef167 = Union[List[object], str, object, None] +IPDeleteResponse = Union[List[object], str, object, None] diff --git a/src/cloudflare/types/addressing/address_maps/ip_update_response.py b/src/cloudflare/types/addressing/address_maps/ip_update_response.py new file mode 100644 index 00000000000..d4b874c9522 --- /dev/null +++ b/src/cloudflare/types/addressing/address_maps/ip_update_response.py @@ -0,0 +1,7 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import List, Union + +__all__ = ["IPUpdateResponse"] + +IPUpdateResponse = Union[List[object], str, object, None] diff --git a/src/cloudflare/types/addressing/address_maps/zone_delete_response.py b/src/cloudflare/types/addressing/address_maps/zone_delete_response.py new file mode 100644 index 00000000000..6fdbcc03fa7 --- /dev/null +++ b/src/cloudflare/types/addressing/address_maps/zone_delete_response.py @@ -0,0 +1,7 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import List, Union + +__all__ = ["ZoneDeleteResponse"] + +ZoneDeleteResponse = Union[List[object], str, object, None] diff --git a/src/cloudflare/types/addressing/address_maps/zone_update_response.py b/src/cloudflare/types/addressing/address_maps/zone_update_response.py new file mode 100644 index 00000000000..1f488961e0d --- /dev/null +++ b/src/cloudflare/types/addressing/address_maps/zone_update_response.py @@ -0,0 +1,7 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import List, Union + +__all__ = ["ZoneUpdateResponse"] + +ZoneUpdateResponse = Union[List[object], str, object, None] diff --git a/src/cloudflare/types/addressing/prefix_delete_response.py b/src/cloudflare/types/addressing/prefix_delete_response.py new file mode 100644 index 00000000000..cf2acba9231 --- /dev/null +++ b/src/cloudflare/types/addressing/prefix_delete_response.py @@ -0,0 +1,7 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import List, Union + +__all__ = ["PrefixDeleteResponse"] + +PrefixDeleteResponse = Union[List[object], str, object, None] diff --git a/src/cloudflare/types/alerting/__init__.py b/src/cloudflare/types/alerting/__init__.py index cd1516c9f63..49aff6f726d 100644 --- a/src/cloudflare/types/alerting/__init__.py +++ b/src/cloudflare/types/alerting/__init__.py @@ -8,4 +8,5 @@ from .policy_create_params import PolicyCreateParams as PolicyCreateParams from .policy_update_params import PolicyUpdateParams as PolicyUpdateParams from .policy_create_response import PolicyCreateResponse as PolicyCreateResponse +from .policy_delete_response import PolicyDeleteResponse as PolicyDeleteResponse from .policy_update_response import PolicyUpdateResponse as PolicyUpdateResponse diff --git a/src/cloudflare/types/alerting/destinations/__init__.py b/src/cloudflare/types/alerting/destinations/__init__.py index 4b73d19b9a5..720b22c588e 100644 --- a/src/cloudflare/types/alerting/destinations/__init__.py +++ b/src/cloudflare/types/alerting/destinations/__init__.py @@ -10,5 +10,7 @@ from .pagerduty_get_response import PagerdutyGetResponse as PagerdutyGetResponse from .pagerduty_link_response import PagerdutyLinkResponse as PagerdutyLinkResponse from .webhook_create_response import WebhookCreateResponse as WebhookCreateResponse +from .webhook_delete_response import WebhookDeleteResponse as WebhookDeleteResponse from .webhook_update_response import WebhookUpdateResponse as WebhookUpdateResponse from .pagerduty_create_response import PagerdutyCreateResponse as PagerdutyCreateResponse +from .pagerduty_delete_response import PagerdutyDeleteResponse as PagerdutyDeleteResponse diff --git a/src/cloudflare/types/alerting/destinations/pagerduty_delete_response.py b/src/cloudflare/types/alerting/destinations/pagerduty_delete_response.py new file mode 100644 index 00000000000..3171e8788bc --- /dev/null +++ b/src/cloudflare/types/alerting/destinations/pagerduty_delete_response.py @@ -0,0 +1,7 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import List, Union + +__all__ = ["PagerdutyDeleteResponse"] + +PagerdutyDeleteResponse = Union[List[object], str, object, None] diff --git a/src/cloudflare/types/alerting/destinations/webhook_delete_response.py b/src/cloudflare/types/alerting/destinations/webhook_delete_response.py new file mode 100644 index 00000000000..2869927bb58 --- /dev/null +++ b/src/cloudflare/types/alerting/destinations/webhook_delete_response.py @@ -0,0 +1,7 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import List, Union + +__all__ = ["WebhookDeleteResponse"] + +WebhookDeleteResponse = Union[List[object], str, object, None] diff --git a/src/cloudflare/types/alerting/policy_delete_response.py b/src/cloudflare/types/alerting/policy_delete_response.py new file mode 100644 index 00000000000..f211604e11c --- /dev/null +++ b/src/cloudflare/types/alerting/policy_delete_response.py @@ -0,0 +1,7 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import List, Union + +__all__ = ["PolicyDeleteResponse"] + +PolicyDeleteResponse = Union[List[object], str, object, None] diff --git a/src/cloudflare/types/firewall/waf/package_list_response.py b/src/cloudflare/types/firewall/waf/package_list_response.py index 607fc5de85e..3279b7cde51 100644 --- a/src/cloudflare/types/firewall/waf/package_list_response.py +++ b/src/cloudflare/types/firewall/waf/package_list_response.py @@ -3,7 +3,7 @@ from typing import List, Union, Optional from typing_extensions import Literal -from ...shared import ResponseInfo, UnnamedSchemaRef167 +from ...shared import ResponseInfo from ...._models import BaseModel __all__ = [ @@ -36,7 +36,7 @@ class LegacyJhsAPIResponseCollection(BaseModel): messages: List[ResponseInfo] - result: Optional[UnnamedSchemaRef167] = None + result: Union[List[object], str, object, None] = None success: Literal[True] """Whether the API call was successful""" diff --git a/src/cloudflare/types/shared/logging.py b/src/cloudflare/types/logging.py similarity index 86% rename from src/cloudflare/types/shared/logging.py rename to src/cloudflare/types/logging.py index 6e4bb74304d..ffa444645ef 100644 --- a/src/cloudflare/types/shared/logging.py +++ b/src/cloudflare/types/logging.py @@ -1,8 +1,6 @@ # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - - -from ..._models import BaseModel +from .._models import BaseModel __all__ = ["Logging"] diff --git a/src/cloudflare/types/shared_params/logging.py b/src/cloudflare/types/logging_param.py similarity index 78% rename from src/cloudflare/types/shared_params/logging.py rename to src/cloudflare/types/logging_param.py index 7220210c22d..7ffdd5a2f4d 100644 --- a/src/cloudflare/types/shared_params/logging.py +++ b/src/cloudflare/types/logging_param.py @@ -4,9 +4,9 @@ from typing_extensions import Required, TypedDict -__all__ = ["Logging"] +__all__ = ["LoggingParam"] -class Logging(TypedDict, total=False): +class LoggingParam(TypedDict, total=False): enabled: Required[bool] """Whether to generate a log when the rule matches.""" diff --git a/src/cloudflare/types/queue_delete_response.py b/src/cloudflare/types/queue_delete_response.py new file mode 100644 index 00000000000..4e660c2b0e0 --- /dev/null +++ b/src/cloudflare/types/queue_delete_response.py @@ -0,0 +1,7 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import List, Union + +__all__ = ["QueueDeleteResponse"] + +QueueDeleteResponse = Union[List[object], str, object, None] diff --git a/src/cloudflare/types/queues/__init__.py b/src/cloudflare/types/queues/__init__.py index a83d84a0d6d..fa5698295b9 100644 --- a/src/cloudflare/types/queues/__init__.py +++ b/src/cloudflare/types/queues/__init__.py @@ -11,4 +11,5 @@ from .consumer_delete_params import ConsumerDeleteParams as ConsumerDeleteParams from .consumer_update_params import ConsumerUpdateParams as ConsumerUpdateParams from .consumer_create_response import ConsumerCreateResponse as ConsumerCreateResponse +from .consumer_delete_response import ConsumerDeleteResponse as ConsumerDeleteResponse from .consumer_update_response import ConsumerUpdateResponse as ConsumerUpdateResponse diff --git a/src/cloudflare/types/queues/consumer_delete_response.py b/src/cloudflare/types/queues/consumer_delete_response.py new file mode 100644 index 00000000000..341f83809a0 --- /dev/null +++ b/src/cloudflare/types/queues/consumer_delete_response.py @@ -0,0 +1,7 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import List, Union + +__all__ = ["ConsumerDeleteResponse"] + +ConsumerDeleteResponse = Union[List[object], str, object, None] diff --git a/src/cloudflare/types/ruleset_create_params.py b/src/cloudflare/types/ruleset_create_params.py index 42f9caae0b2..7a9b1dd3d38 100644 --- a/src/cloudflare/types/ruleset_create_params.py +++ b/src/cloudflare/types/ruleset_create_params.py @@ -5,7 +5,7 @@ from typing import Dict, List, Union, Iterable from typing_extensions import Literal, Required, TypedDict -from ..types import shared_params +from .logging_param import LoggingParam __all__ = [ "RulesetCreateParams", @@ -109,7 +109,7 @@ class RuleRulesetsBlockRule(TypedDict, total=False): expression: str """The expression defining which traffic will match the rule.""" - logging: shared_params.Logging + logging: LoggingParam """An object configuring the rule's logging behavior.""" ref: str @@ -212,7 +212,7 @@ class RuleRulesetsExecuteRule(TypedDict, total=False): expression: str """The expression defining which traffic will match the rule.""" - logging: shared_params.Logging + logging: LoggingParam """An object configuring the rule's logging behavior.""" ref: str @@ -238,7 +238,7 @@ class RuleRulesetsLogRule(TypedDict, total=False): expression: str """The expression defining which traffic will match the rule.""" - logging: shared_params.Logging + logging: LoggingParam """An object configuring the rule's logging behavior.""" ref: str @@ -319,7 +319,7 @@ class RuleRulesetsSkipRule(TypedDict, total=False): expression: str """The expression defining which traffic will match the rule.""" - logging: shared_params.Logging + logging: LoggingParam """An object configuring the rule's logging behavior.""" ref: str diff --git a/src/cloudflare/types/ruleset_create_response.py b/src/cloudflare/types/ruleset_create_response.py index 5db43f26ec3..69f93275e51 100644 --- a/src/cloudflare/types/ruleset_create_response.py +++ b/src/cloudflare/types/ruleset_create_response.py @@ -4,7 +4,7 @@ from datetime import datetime from typing_extensions import Literal -from .shared import Logging +from .logging import Logging from .._models import BaseModel __all__ = [ diff --git a/src/cloudflare/types/ruleset_get_response.py b/src/cloudflare/types/ruleset_get_response.py index 413dce87839..d011e4f229d 100644 --- a/src/cloudflare/types/ruleset_get_response.py +++ b/src/cloudflare/types/ruleset_get_response.py @@ -4,7 +4,7 @@ from datetime import datetime from typing_extensions import Literal -from .shared import Logging +from .logging import Logging from .._models import BaseModel __all__ = [ diff --git a/src/cloudflare/types/ruleset_update_params.py b/src/cloudflare/types/ruleset_update_params.py index ce5feee4b6d..b87d83ddc70 100644 --- a/src/cloudflare/types/ruleset_update_params.py +++ b/src/cloudflare/types/ruleset_update_params.py @@ -5,7 +5,7 @@ from typing import Dict, List, Union, Iterable from typing_extensions import Literal, Required, TypedDict -from ..types import shared_params +from .logging_param import LoggingParam __all__ = [ "RulesetUpdateParams", @@ -107,7 +107,7 @@ class RuleRulesetsBlockRule(TypedDict, total=False): expression: str """The expression defining which traffic will match the rule.""" - logging: shared_params.Logging + logging: LoggingParam """An object configuring the rule's logging behavior.""" ref: str @@ -210,7 +210,7 @@ class RuleRulesetsExecuteRule(TypedDict, total=False): expression: str """The expression defining which traffic will match the rule.""" - logging: shared_params.Logging + logging: LoggingParam """An object configuring the rule's logging behavior.""" ref: str @@ -236,7 +236,7 @@ class RuleRulesetsLogRule(TypedDict, total=False): expression: str """The expression defining which traffic will match the rule.""" - logging: shared_params.Logging + logging: LoggingParam """An object configuring the rule's logging behavior.""" ref: str @@ -317,7 +317,7 @@ class RuleRulesetsSkipRule(TypedDict, total=False): expression: str """The expression defining which traffic will match the rule.""" - logging: shared_params.Logging + logging: LoggingParam """An object configuring the rule's logging behavior.""" ref: str diff --git a/src/cloudflare/types/ruleset_update_response.py b/src/cloudflare/types/ruleset_update_response.py index c710dbf576a..1dc8e40e095 100644 --- a/src/cloudflare/types/ruleset_update_response.py +++ b/src/cloudflare/types/ruleset_update_response.py @@ -4,7 +4,7 @@ from datetime import datetime from typing_extensions import Literal -from .shared import Logging +from .logging import Logging from .._models import BaseModel __all__ = [ diff --git a/src/cloudflare/types/rulesets/phase_get_response.py b/src/cloudflare/types/rulesets/phase_get_response.py index 242b61e4dce..109fe1a99a8 100644 --- a/src/cloudflare/types/rulesets/phase_get_response.py +++ b/src/cloudflare/types/rulesets/phase_get_response.py @@ -4,7 +4,7 @@ from datetime import datetime from typing_extensions import Literal -from ..shared import Logging +from ..logging import Logging from ..._models import BaseModel __all__ = [ diff --git a/src/cloudflare/types/rulesets/phase_update_params.py b/src/cloudflare/types/rulesets/phase_update_params.py index affacd4914f..29f1b5d1aef 100644 --- a/src/cloudflare/types/rulesets/phase_update_params.py +++ b/src/cloudflare/types/rulesets/phase_update_params.py @@ -5,7 +5,7 @@ from typing import Dict, List, Union, Iterable from typing_extensions import Literal, Required, TypedDict -from ...types import shared_params +from ..logging_param import LoggingParam __all__ = [ "PhaseUpdateParams", @@ -107,7 +107,7 @@ class RuleRulesetsBlockRule(TypedDict, total=False): expression: str """The expression defining which traffic will match the rule.""" - logging: shared_params.Logging + logging: LoggingParam """An object configuring the rule's logging behavior.""" ref: str @@ -210,7 +210,7 @@ class RuleRulesetsExecuteRule(TypedDict, total=False): expression: str """The expression defining which traffic will match the rule.""" - logging: shared_params.Logging + logging: LoggingParam """An object configuring the rule's logging behavior.""" ref: str @@ -236,7 +236,7 @@ class RuleRulesetsLogRule(TypedDict, total=False): expression: str """The expression defining which traffic will match the rule.""" - logging: shared_params.Logging + logging: LoggingParam """An object configuring the rule's logging behavior.""" ref: str @@ -317,7 +317,7 @@ class RuleRulesetsSkipRule(TypedDict, total=False): expression: str """The expression defining which traffic will match the rule.""" - logging: shared_params.Logging + logging: LoggingParam """An object configuring the rule's logging behavior.""" ref: str diff --git a/src/cloudflare/types/rulesets/phase_update_response.py b/src/cloudflare/types/rulesets/phase_update_response.py index 40af85f6eb4..6105d1dc99e 100644 --- a/src/cloudflare/types/rulesets/phase_update_response.py +++ b/src/cloudflare/types/rulesets/phase_update_response.py @@ -4,7 +4,7 @@ from datetime import datetime from typing_extensions import Literal -from ..shared import Logging +from ..logging import Logging from ..._models import BaseModel __all__ = [ diff --git a/src/cloudflare/types/rulesets/phases/version_get_response.py b/src/cloudflare/types/rulesets/phases/version_get_response.py index 9cc6e6e807d..6fd98d0fa85 100644 --- a/src/cloudflare/types/rulesets/phases/version_get_response.py +++ b/src/cloudflare/types/rulesets/phases/version_get_response.py @@ -4,7 +4,7 @@ from datetime import datetime from typing_extensions import Literal -from ...shared import Logging +from ...logging import Logging from ...._models import BaseModel __all__ = [ diff --git a/src/cloudflare/types/rulesets/rule_create_params.py b/src/cloudflare/types/rulesets/rule_create_params.py index 26e93ea9fdf..45e14423068 100644 --- a/src/cloudflare/types/rulesets/rule_create_params.py +++ b/src/cloudflare/types/rulesets/rule_create_params.py @@ -5,7 +5,7 @@ from typing import Dict, List, Union, Iterable from typing_extensions import Literal, Required, TypedDict -from ...types import shared_params +from ..logging_param import LoggingParam __all__ = [ "RuleCreateParams", @@ -49,7 +49,7 @@ class RulesetsBlockRule(TypedDict, total=False): expression: str """The expression defining which traffic will match the rule.""" - logging: shared_params.Logging + logging: LoggingParam """An object configuring the rule's logging behavior.""" ref: str @@ -97,7 +97,7 @@ class RulesetsExecuteRule(TypedDict, total=False): expression: str """The expression defining which traffic will match the rule.""" - logging: shared_params.Logging + logging: LoggingParam """An object configuring the rule's logging behavior.""" ref: str @@ -206,7 +206,7 @@ class RulesetsLogRule(TypedDict, total=False): expression: str """The expression defining which traffic will match the rule.""" - logging: shared_params.Logging + logging: LoggingParam """An object configuring the rule's logging behavior.""" ref: str @@ -238,7 +238,7 @@ class RulesetsSkipRule(TypedDict, total=False): expression: str """The expression defining which traffic will match the rule.""" - logging: shared_params.Logging + logging: LoggingParam """An object configuring the rule's logging behavior.""" ref: str diff --git a/src/cloudflare/types/rulesets/rule_create_response.py b/src/cloudflare/types/rulesets/rule_create_response.py index 29f5df7156b..9e55762e6a8 100644 --- a/src/cloudflare/types/rulesets/rule_create_response.py +++ b/src/cloudflare/types/rulesets/rule_create_response.py @@ -4,7 +4,7 @@ from datetime import datetime from typing_extensions import Literal -from ..shared import Logging +from ..logging import Logging from ..._models import BaseModel __all__ = [ diff --git a/src/cloudflare/types/rulesets/rule_delete_response.py b/src/cloudflare/types/rulesets/rule_delete_response.py index 81cf4352479..f7557fd53e7 100644 --- a/src/cloudflare/types/rulesets/rule_delete_response.py +++ b/src/cloudflare/types/rulesets/rule_delete_response.py @@ -4,7 +4,7 @@ from datetime import datetime from typing_extensions import Literal -from ..shared import Logging +from ..logging import Logging from ..._models import BaseModel __all__ = [ diff --git a/src/cloudflare/types/rulesets/rule_edit_params.py b/src/cloudflare/types/rulesets/rule_edit_params.py index 86ccc259473..4924cb126d1 100644 --- a/src/cloudflare/types/rulesets/rule_edit_params.py +++ b/src/cloudflare/types/rulesets/rule_edit_params.py @@ -5,7 +5,7 @@ from typing import Dict, List, Union, Iterable from typing_extensions import Literal, Required, TypedDict -from ...types import shared_params +from ..logging_param import LoggingParam __all__ = [ "RuleEditParams", @@ -52,7 +52,7 @@ class RulesetsBlockRule(TypedDict, total=False): expression: str """The expression defining which traffic will match the rule.""" - logging: shared_params.Logging + logging: LoggingParam """An object configuring the rule's logging behavior.""" ref: str @@ -103,7 +103,7 @@ class RulesetsExecuteRule(TypedDict, total=False): expression: str """The expression defining which traffic will match the rule.""" - logging: shared_params.Logging + logging: LoggingParam """An object configuring the rule's logging behavior.""" ref: str @@ -215,7 +215,7 @@ class RulesetsLogRule(TypedDict, total=False): expression: str """The expression defining which traffic will match the rule.""" - logging: shared_params.Logging + logging: LoggingParam """An object configuring the rule's logging behavior.""" ref: str @@ -250,7 +250,7 @@ class RulesetsSkipRule(TypedDict, total=False): expression: str """The expression defining which traffic will match the rule.""" - logging: shared_params.Logging + logging: LoggingParam """An object configuring the rule's logging behavior.""" ref: str diff --git a/src/cloudflare/types/rulesets/rule_edit_response.py b/src/cloudflare/types/rulesets/rule_edit_response.py index 00a6972b403..ca3b5bbc9d8 100644 --- a/src/cloudflare/types/rulesets/rule_edit_response.py +++ b/src/cloudflare/types/rulesets/rule_edit_response.py @@ -4,7 +4,7 @@ from datetime import datetime from typing_extensions import Literal -from ..shared import Logging +from ..logging import Logging from ..._models import BaseModel __all__ = [ diff --git a/src/cloudflare/types/rulesets/version_get_response.py b/src/cloudflare/types/rulesets/version_get_response.py index 7d3b0d572eb..905e116a774 100644 --- a/src/cloudflare/types/rulesets/version_get_response.py +++ b/src/cloudflare/types/rulesets/version_get_response.py @@ -4,7 +4,7 @@ from datetime import datetime from typing_extensions import Literal -from ..shared import Logging +from ..logging import Logging from ..._models import BaseModel __all__ = [ diff --git a/src/cloudflare/types/rulesets/versions/by_tag_get_response.py b/src/cloudflare/types/rulesets/versions/by_tag_get_response.py index 46216aba8db..7da35010c1c 100644 --- a/src/cloudflare/types/rulesets/versions/by_tag_get_response.py +++ b/src/cloudflare/types/rulesets/versions/by_tag_get_response.py @@ -4,7 +4,7 @@ from datetime import datetime from typing_extensions import Literal -from ...shared import Logging +from ...logging import Logging from ...._models import BaseModel __all__ = [ diff --git a/src/cloudflare/types/shared/__init__.py b/src/cloudflare/types/shared/__init__.py index 44e2a7fa297..5f9e645d630 100644 --- a/src/cloudflare/types/shared/__init__.py +++ b/src/cloudflare/types/shared/__init__.py @@ -1,6 +1,5 @@ # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. -from .logging import Logging as Logging from .error_data import ErrorData as ErrorData from .response_info import ResponseInfo as ResponseInfo from .unnamed_schema_ref_2 import UnnamedSchemaRef2 as UnnamedSchemaRef2 @@ -116,7 +115,6 @@ from .unnamed_schema_ref_161 import UnnamedSchemaRef161 as UnnamedSchemaRef161 from .unnamed_schema_ref_162 import UnnamedSchemaRef162 as UnnamedSchemaRef162 from .unnamed_schema_ref_163 import UnnamedSchemaRef163 as UnnamedSchemaRef163 -from .unnamed_schema_ref_167 import UnnamedSchemaRef167 as UnnamedSchemaRef167 from .unnamed_schema_ref_169 import UnnamedSchemaRef169 as UnnamedSchemaRef169 from .unnamed_schema_ref_170 import UnnamedSchemaRef170 as UnnamedSchemaRef170 from .unnamed_schema_ref_171 import UnnamedSchemaRef171 as UnnamedSchemaRef171 diff --git a/src/cloudflare/types/shared_params/__init__.py b/src/cloudflare/types/shared_params/__init__.py index 7cb043e279b..4e45e97a45b 100644 --- a/src/cloudflare/types/shared_params/__init__.py +++ b/src/cloudflare/types/shared_params/__init__.py @@ -1,6 +1,5 @@ # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. -from .logging import Logging as Logging from .response_info import ResponseInfo as ResponseInfo from .unnamed_schema_ref_28 import UnnamedSchemaRef28 as UnnamedSchemaRef28 from .unnamed_schema_ref_51 import UnnamedSchemaRef51 as UnnamedSchemaRef51 diff --git a/src/cloudflare/types/user/firewall/__init__.py b/src/cloudflare/types/user/firewall/__init__.py index 5723f059778..b18b56db6ab 100644 --- a/src/cloudflare/types/user/firewall/__init__.py +++ b/src/cloudflare/types/user/firewall/__init__.py @@ -2,7 +2,7 @@ from __future__ import annotations -from .firewall_rule import FirewallRule as FirewallRule +from .access_rule import AccessRule as AccessRule from .access_rule_edit_params import AccessRuleEditParams as AccessRuleEditParams from .access_rule_list_params import AccessRuleListParams as AccessRuleListParams from .access_rule_create_params import AccessRuleCreateParams as AccessRuleCreateParams diff --git a/src/cloudflare/types/user/firewall/firewall_rule.py b/src/cloudflare/types/user/firewall/access_rule.py similarity index 98% rename from src/cloudflare/types/user/firewall/firewall_rule.py rename to src/cloudflare/types/user/firewall/access_rule.py index f7bc7e5f602..23ce5c90f5b 100644 --- a/src/cloudflare/types/user/firewall/firewall_rule.py +++ b/src/cloudflare/types/user/firewall/access_rule.py @@ -7,7 +7,7 @@ from ...._models import BaseModel __all__ = [ - "FirewallRule", + "AccessRule", "Configuration", "ConfigurationLegacyJhsIPConfiguration", "ConfigurationLegacyJhsIPV6Configuration", @@ -94,7 +94,7 @@ class ConfigurationLegacyJhsCountryConfiguration(BaseModel): ] -class FirewallRule(BaseModel): +class AccessRule(BaseModel): id: str """The unique identifier of the IP Access rule.""" diff --git a/src/cloudflare/types/user/load_balancers/__init__.py b/src/cloudflare/types/user/load_balancers/__init__.py index cea9ebd43c5..d1764e4e11b 100644 --- a/src/cloudflare/types/user/load_balancers/__init__.py +++ b/src/cloudflare/types/user/load_balancers/__init__.py @@ -2,12 +2,13 @@ from __future__ import annotations +from .pool import Pool as Pool +from .monitor import Monitor as Monitor from .pool_edit_params import PoolEditParams as PoolEditParams from .pool_list_params import PoolListParams as PoolListParams from .pool_create_params import PoolCreateParams as PoolCreateParams from .pool_delete_params import PoolDeleteParams as PoolDeleteParams from .pool_update_params import PoolUpdateParams as PoolUpdateParams -from .load_balancing_pool import LoadBalancingPool as LoadBalancingPool from .monitor_edit_params import MonitorEditParams as MonitorEditParams from .pool_preview_params import PoolPreviewParams as PoolPreviewParams from .pool_delete_response import PoolDeleteResponse as PoolDeleteResponse @@ -16,7 +17,6 @@ from .monitor_delete_params import MonitorDeleteParams as MonitorDeleteParams from .monitor_update_params import MonitorUpdateParams as MonitorUpdateParams from .pool_preview_response import PoolPreviewResponse as PoolPreviewResponse -from .load_balancing_monitor import LoadBalancingMonitor as LoadBalancingMonitor from .load_balancing_preview import LoadBalancingPreview as LoadBalancingPreview from .monitor_preview_params import MonitorPreviewParams as MonitorPreviewParams from .monitor_delete_response import MonitorDeleteResponse as MonitorDeleteResponse diff --git a/src/cloudflare/types/user/load_balancers/load_balancing_monitor.py b/src/cloudflare/types/user/load_balancers/monitor.py similarity index 97% rename from src/cloudflare/types/user/load_balancers/load_balancing_monitor.py rename to src/cloudflare/types/user/load_balancers/monitor.py index 5d89fdbd050..716caa49ec0 100644 --- a/src/cloudflare/types/user/load_balancers/load_balancing_monitor.py +++ b/src/cloudflare/types/user/load_balancers/monitor.py @@ -6,10 +6,10 @@ from ...._models import BaseModel -__all__ = ["LoadBalancingMonitor"] +__all__ = ["Monitor"] -class LoadBalancingMonitor(BaseModel): +class Monitor(BaseModel): id: Optional[str] = None allow_insecure: Optional[bool] = None diff --git a/src/cloudflare/types/user/load_balancers/load_balancing_pool.py b/src/cloudflare/types/user/load_balancers/pool.py similarity index 99% rename from src/cloudflare/types/user/load_balancers/load_balancing_pool.py rename to src/cloudflare/types/user/load_balancers/pool.py index 6204fd4f094..2380e7714ec 100644 --- a/src/cloudflare/types/user/load_balancers/load_balancing_pool.py +++ b/src/cloudflare/types/user/load_balancers/pool.py @@ -9,7 +9,7 @@ from ...._models import BaseModel __all__ = [ - "LoadBalancingPool", + "Pool", "LoadShedding", "NotificationFilter", "NotificationFilterOrigin", @@ -160,7 +160,7 @@ class Origin(BaseModel): """ -class LoadBalancingPool(BaseModel): +class Pool(BaseModel): id: Optional[str] = None check_regions: Optional[ diff --git a/src/cloudflare/types/zones/__init__.py b/src/cloudflare/types/zones/__init__.py index e425529e08c..26f7ae3686e 100644 --- a/src/cloudflare/types/zones/__init__.py +++ b/src/cloudflare/types/zones/__init__.py @@ -16,6 +16,7 @@ from .subscription_create_params import SubscriptionCreateParams as SubscriptionCreateParams from .subscription_list_response import SubscriptionListResponse as SubscriptionListResponse from .subscription_create_response import SubscriptionCreateResponse as SubscriptionCreateResponse +from .custom_nameserver_get_response import CustomNameserverGetResponse as CustomNameserverGetResponse from .custom_nameserver_update_params import CustomNameserverUpdateParams as CustomNameserverUpdateParams from .activation_check_trigger_response import ActivationCheckTriggerResponse as ActivationCheckTriggerResponse from .custom_nameserver_update_response import CustomNameserverUpdateResponse as CustomNameserverUpdateResponse diff --git a/src/cloudflare/types/zones/custom_nameserver_get_response.py b/src/cloudflare/types/zones/custom_nameserver_get_response.py new file mode 100644 index 00000000000..a257787a184 --- /dev/null +++ b/src/cloudflare/types/zones/custom_nameserver_get_response.py @@ -0,0 +1,7 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import List, Union + +__all__ = ["CustomNameserverGetResponse"] + +CustomNameserverGetResponse = Union[List[object], str, object, None] diff --git a/tests/api_resources/addressing/address_maps/test_accounts.py b/tests/api_resources/addressing/address_maps/test_accounts.py index 93679ac2878..873237569e9 100644 --- a/tests/api_resources/addressing/address_maps/test_accounts.py +++ b/tests/api_resources/addressing/address_maps/test_accounts.py @@ -9,7 +9,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.shared import UnnamedSchemaRef167 +from cloudflare.types.addressing.address_maps import ( + AccountDeleteResponse, + AccountUpdateResponse, +) base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -25,7 +28,7 @@ def test_method_update(self, client: Cloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", body={}, ) - assert_matches_type(Optional[UnnamedSchemaRef167], account, path=["response"]) + assert_matches_type(Optional[AccountUpdateResponse], account, path=["response"]) @pytest.mark.skip() @parametrize @@ -39,7 +42,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" account = response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], account, path=["response"]) + assert_matches_type(Optional[AccountUpdateResponse], account, path=["response"]) @pytest.mark.skip() @parametrize @@ -53,7 +56,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" account = response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], account, path=["response"]) + assert_matches_type(Optional[AccountUpdateResponse], account, path=["response"]) assert cast(Any, response.is_closed) is True @@ -82,7 +85,7 @@ def test_method_delete(self, client: Cloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", body={}, ) - assert_matches_type(Optional[UnnamedSchemaRef167], account, path=["response"]) + assert_matches_type(Optional[AccountDeleteResponse], account, path=["response"]) @pytest.mark.skip() @parametrize @@ -96,7 +99,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" account = response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], account, path=["response"]) + assert_matches_type(Optional[AccountDeleteResponse], account, path=["response"]) @pytest.mark.skip() @parametrize @@ -110,7 +113,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" account = response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], account, path=["response"]) + assert_matches_type(Optional[AccountDeleteResponse], account, path=["response"]) assert cast(Any, response.is_closed) is True @@ -143,7 +146,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", body={}, ) - assert_matches_type(Optional[UnnamedSchemaRef167], account, path=["response"]) + assert_matches_type(Optional[AccountUpdateResponse], account, path=["response"]) @pytest.mark.skip() @parametrize @@ -157,7 +160,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" account = await response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], account, path=["response"]) + assert_matches_type(Optional[AccountUpdateResponse], account, path=["response"]) @pytest.mark.skip() @parametrize @@ -171,7 +174,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" account = await response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], account, path=["response"]) + assert_matches_type(Optional[AccountUpdateResponse], account, path=["response"]) assert cast(Any, response.is_closed) is True @@ -200,7 +203,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", body={}, ) - assert_matches_type(Optional[UnnamedSchemaRef167], account, path=["response"]) + assert_matches_type(Optional[AccountDeleteResponse], account, path=["response"]) @pytest.mark.skip() @parametrize @@ -214,7 +217,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" account = await response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], account, path=["response"]) + assert_matches_type(Optional[AccountDeleteResponse], account, path=["response"]) @pytest.mark.skip() @parametrize @@ -228,7 +231,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" account = await response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], account, path=["response"]) + assert_matches_type(Optional[AccountDeleteResponse], account, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/addressing/address_maps/test_ips.py b/tests/api_resources/addressing/address_maps/test_ips.py index 8e9406b5062..5ac092eb762 100644 --- a/tests/api_resources/addressing/address_maps/test_ips.py +++ b/tests/api_resources/addressing/address_maps/test_ips.py @@ -9,7 +9,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.shared import UnnamedSchemaRef167 +from cloudflare.types.addressing.address_maps import ( + IPDeleteResponse, + IPUpdateResponse, +) base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -26,7 +29,7 @@ def test_method_update(self, client: Cloudflare) -> None: address_map_id="023e105f4ecef8ad9ca31a8372d0c353", body={}, ) - assert_matches_type(Optional[UnnamedSchemaRef167], ip, path=["response"]) + assert_matches_type(Optional[IPUpdateResponse], ip, path=["response"]) @pytest.mark.skip() @parametrize @@ -41,7 +44,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" ip = response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], ip, path=["response"]) + assert_matches_type(Optional[IPUpdateResponse], ip, path=["response"]) @pytest.mark.skip() @parametrize @@ -56,7 +59,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" ip = response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], ip, path=["response"]) + assert_matches_type(Optional[IPUpdateResponse], ip, path=["response"]) assert cast(Any, response.is_closed) is True @@ -96,7 +99,7 @@ def test_method_delete(self, client: Cloudflare) -> None: address_map_id="023e105f4ecef8ad9ca31a8372d0c353", body={}, ) - assert_matches_type(Optional[UnnamedSchemaRef167], ip, path=["response"]) + assert_matches_type(Optional[IPDeleteResponse], ip, path=["response"]) @pytest.mark.skip() @parametrize @@ -111,7 +114,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" ip = response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], ip, path=["response"]) + assert_matches_type(Optional[IPDeleteResponse], ip, path=["response"]) @pytest.mark.skip() @parametrize @@ -126,7 +129,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" ip = response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], ip, path=["response"]) + assert_matches_type(Optional[IPDeleteResponse], ip, path=["response"]) assert cast(Any, response.is_closed) is True @@ -170,7 +173,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None: address_map_id="023e105f4ecef8ad9ca31a8372d0c353", body={}, ) - assert_matches_type(Optional[UnnamedSchemaRef167], ip, path=["response"]) + assert_matches_type(Optional[IPUpdateResponse], ip, path=["response"]) @pytest.mark.skip() @parametrize @@ -185,7 +188,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" ip = await response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], ip, path=["response"]) + assert_matches_type(Optional[IPUpdateResponse], ip, path=["response"]) @pytest.mark.skip() @parametrize @@ -200,7 +203,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" ip = await response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], ip, path=["response"]) + assert_matches_type(Optional[IPUpdateResponse], ip, path=["response"]) assert cast(Any, response.is_closed) is True @@ -240,7 +243,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None: address_map_id="023e105f4ecef8ad9ca31a8372d0c353", body={}, ) - assert_matches_type(Optional[UnnamedSchemaRef167], ip, path=["response"]) + assert_matches_type(Optional[IPDeleteResponse], ip, path=["response"]) @pytest.mark.skip() @parametrize @@ -255,7 +258,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" ip = await response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], ip, path=["response"]) + assert_matches_type(Optional[IPDeleteResponse], ip, path=["response"]) @pytest.mark.skip() @parametrize @@ -270,7 +273,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" ip = await response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], ip, path=["response"]) + assert_matches_type(Optional[IPDeleteResponse], ip, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/addressing/address_maps/test_zones.py b/tests/api_resources/addressing/address_maps/test_zones.py index 3bb814ff629..450019f8c44 100644 --- a/tests/api_resources/addressing/address_maps/test_zones.py +++ b/tests/api_resources/addressing/address_maps/test_zones.py @@ -9,7 +9,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.shared import UnnamedSchemaRef167 +from cloudflare.types.addressing.address_maps import ( + ZoneDeleteResponse, + ZoneUpdateResponse, +) base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -26,7 +29,7 @@ def test_method_update(self, client: Cloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", body={}, ) - assert_matches_type(Optional[UnnamedSchemaRef167], zone, path=["response"]) + assert_matches_type(Optional[ZoneUpdateResponse], zone, path=["response"]) @pytest.mark.skip() @parametrize @@ -41,7 +44,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" zone = response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], zone, path=["response"]) + assert_matches_type(Optional[ZoneUpdateResponse], zone, path=["response"]) @pytest.mark.skip() @parametrize @@ -56,7 +59,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" zone = response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], zone, path=["response"]) + assert_matches_type(Optional[ZoneUpdateResponse], zone, path=["response"]) assert cast(Any, response.is_closed) is True @@ -96,7 +99,7 @@ def test_method_delete(self, client: Cloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", body={}, ) - assert_matches_type(Optional[UnnamedSchemaRef167], zone, path=["response"]) + assert_matches_type(Optional[ZoneDeleteResponse], zone, path=["response"]) @pytest.mark.skip() @parametrize @@ -111,7 +114,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" zone = response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], zone, path=["response"]) + assert_matches_type(Optional[ZoneDeleteResponse], zone, path=["response"]) @pytest.mark.skip() @parametrize @@ -126,7 +129,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" zone = response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], zone, path=["response"]) + assert_matches_type(Optional[ZoneDeleteResponse], zone, path=["response"]) assert cast(Any, response.is_closed) is True @@ -170,7 +173,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", body={}, ) - assert_matches_type(Optional[UnnamedSchemaRef167], zone, path=["response"]) + assert_matches_type(Optional[ZoneUpdateResponse], zone, path=["response"]) @pytest.mark.skip() @parametrize @@ -185,7 +188,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" zone = await response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], zone, path=["response"]) + assert_matches_type(Optional[ZoneUpdateResponse], zone, path=["response"]) @pytest.mark.skip() @parametrize @@ -200,7 +203,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" zone = await response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], zone, path=["response"]) + assert_matches_type(Optional[ZoneUpdateResponse], zone, path=["response"]) assert cast(Any, response.is_closed) is True @@ -240,7 +243,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", body={}, ) - assert_matches_type(Optional[UnnamedSchemaRef167], zone, path=["response"]) + assert_matches_type(Optional[ZoneDeleteResponse], zone, path=["response"]) @pytest.mark.skip() @parametrize @@ -255,7 +258,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" zone = await response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], zone, path=["response"]) + assert_matches_type(Optional[ZoneDeleteResponse], zone, path=["response"]) @pytest.mark.skip() @parametrize @@ -270,7 +273,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" zone = await response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], zone, path=["response"]) + assert_matches_type(Optional[ZoneDeleteResponse], zone, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/addressing/test_address_maps.py b/tests/api_resources/addressing/test_address_maps.py index c414336e7fc..d97e34185ae 100644 --- a/tests/api_resources/addressing/test_address_maps.py +++ b/tests/api_resources/addressing/test_address_maps.py @@ -10,11 +10,11 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.shared import UnnamedSchemaRef167 from cloudflare.types.addressing import ( AddressingAddressMaps, AddressMapGetResponse, AddressMapCreateResponse, + AddressMapDeleteResponse, ) base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -125,7 +125,7 @@ def test_method_delete(self, client: Cloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", body={}, ) - assert_matches_type(Optional[UnnamedSchemaRef167], address_map, path=["response"]) + assert_matches_type(Optional[AddressMapDeleteResponse], address_map, path=["response"]) @pytest.mark.skip() @parametrize @@ -139,7 +139,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" address_map = response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], address_map, path=["response"]) + assert_matches_type(Optional[AddressMapDeleteResponse], address_map, path=["response"]) @pytest.mark.skip() @parametrize @@ -153,7 +153,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" address_map = response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], address_map, path=["response"]) + assert_matches_type(Optional[AddressMapDeleteResponse], address_map, path=["response"]) assert cast(Any, response.is_closed) is True @@ -396,7 +396,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", body={}, ) - assert_matches_type(Optional[UnnamedSchemaRef167], address_map, path=["response"]) + assert_matches_type(Optional[AddressMapDeleteResponse], address_map, path=["response"]) @pytest.mark.skip() @parametrize @@ -410,7 +410,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" address_map = await response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], address_map, path=["response"]) + assert_matches_type(Optional[AddressMapDeleteResponse], address_map, path=["response"]) @pytest.mark.skip() @parametrize @@ -424,7 +424,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" address_map = await response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], address_map, path=["response"]) + assert_matches_type(Optional[AddressMapDeleteResponse], address_map, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/addressing/test_prefixes.py b/tests/api_resources/addressing/test_prefixes.py index 8bc287d7a3a..69b0b61d288 100644 --- a/tests/api_resources/addressing/test_prefixes.py +++ b/tests/api_resources/addressing/test_prefixes.py @@ -10,8 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.shared import UnnamedSchemaRef167 from cloudflare.types.addressing import ( + PrefixDeleteResponse, AddressingIpamPrefixes, ) @@ -125,7 +125,7 @@ def test_method_delete(self, client: Cloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", body={}, ) - assert_matches_type(Optional[UnnamedSchemaRef167], prefix, path=["response"]) + assert_matches_type(Optional[PrefixDeleteResponse], prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -139,7 +139,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" prefix = response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], prefix, path=["response"]) + assert_matches_type(Optional[PrefixDeleteResponse], prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -153,7 +153,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" prefix = response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], prefix, path=["response"]) + assert_matches_type(Optional[PrefixDeleteResponse], prefix, path=["response"]) assert cast(Any, response.is_closed) is True @@ -391,7 +391,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", body={}, ) - assert_matches_type(Optional[UnnamedSchemaRef167], prefix, path=["response"]) + assert_matches_type(Optional[PrefixDeleteResponse], prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -405,7 +405,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" prefix = await response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], prefix, path=["response"]) + assert_matches_type(Optional[PrefixDeleteResponse], prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -419,7 +419,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" prefix = await response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], prefix, path=["response"]) + assert_matches_type(Optional[PrefixDeleteResponse], prefix, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/alerting/destinations/test_pagerduty.py b/tests/api_resources/alerting/destinations/test_pagerduty.py index e354346dbc2..07b1cb56436 100644 --- a/tests/api_resources/alerting/destinations/test_pagerduty.py +++ b/tests/api_resources/alerting/destinations/test_pagerduty.py @@ -9,8 +9,12 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.shared import UnnamedSchemaRef167 -from cloudflare.types.alerting.destinations import PagerdutyGetResponse, PagerdutyLinkResponse, PagerdutyCreateResponse +from cloudflare.types.alerting.destinations import ( + PagerdutyGetResponse, + PagerdutyLinkResponse, + PagerdutyCreateResponse, + PagerdutyDeleteResponse, +) base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -66,7 +70,7 @@ def test_method_delete(self, client: Cloudflare) -> None: pagerduty = client.alerting.destinations.pagerduty.delete( account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(Optional[UnnamedSchemaRef167], pagerduty, path=["response"]) + assert_matches_type(Optional[PagerdutyDeleteResponse], pagerduty, path=["response"]) @pytest.mark.skip() @parametrize @@ -78,7 +82,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" pagerduty = response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], pagerduty, path=["response"]) + assert_matches_type(Optional[PagerdutyDeleteResponse], pagerduty, path=["response"]) @pytest.mark.skip() @parametrize @@ -90,7 +94,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" pagerduty = response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], pagerduty, path=["response"]) + assert_matches_type(Optional[PagerdutyDeleteResponse], pagerduty, path=["response"]) assert cast(Any, response.is_closed) is True @@ -248,7 +252,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None: pagerduty = await async_client.alerting.destinations.pagerduty.delete( account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(Optional[UnnamedSchemaRef167], pagerduty, path=["response"]) + assert_matches_type(Optional[PagerdutyDeleteResponse], pagerduty, path=["response"]) @pytest.mark.skip() @parametrize @@ -260,7 +264,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" pagerduty = await response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], pagerduty, path=["response"]) + assert_matches_type(Optional[PagerdutyDeleteResponse], pagerduty, path=["response"]) @pytest.mark.skip() @parametrize @@ -272,7 +276,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" pagerduty = await response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], pagerduty, path=["response"]) + assert_matches_type(Optional[PagerdutyDeleteResponse], pagerduty, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/alerting/destinations/test_webhooks.py b/tests/api_resources/alerting/destinations/test_webhooks.py index 58a3d0d41ec..315b3c36ea4 100644 --- a/tests/api_resources/alerting/destinations/test_webhooks.py +++ b/tests/api_resources/alerting/destinations/test_webhooks.py @@ -10,10 +10,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.shared import UnnamedSchemaRef167 from cloudflare.types.alerting.destinations import ( AlertingWebhooks, WebhookCreateResponse, + WebhookDeleteResponse, WebhookUpdateResponse, ) @@ -207,7 +207,7 @@ def test_method_delete(self, client: Cloudflare) -> None: "b115d5ec-15c6-41ee-8b76-92c449b5227b", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(Optional[UnnamedSchemaRef167], webhook, path=["response"]) + assert_matches_type(Optional[WebhookDeleteResponse], webhook, path=["response"]) @pytest.mark.skip() @parametrize @@ -220,7 +220,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" webhook = response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], webhook, path=["response"]) + assert_matches_type(Optional[WebhookDeleteResponse], webhook, path=["response"]) @pytest.mark.skip() @parametrize @@ -233,7 +233,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" webhook = response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], webhook, path=["response"]) + assert_matches_type(Optional[WebhookDeleteResponse], webhook, path=["response"]) assert cast(Any, response.is_closed) is True @@ -492,7 +492,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None: "b115d5ec-15c6-41ee-8b76-92c449b5227b", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(Optional[UnnamedSchemaRef167], webhook, path=["response"]) + assert_matches_type(Optional[WebhookDeleteResponse], webhook, path=["response"]) @pytest.mark.skip() @parametrize @@ -505,7 +505,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" webhook = await response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], webhook, path=["response"]) + assert_matches_type(Optional[WebhookDeleteResponse], webhook, path=["response"]) @pytest.mark.skip() @parametrize @@ -518,7 +518,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" webhook = await response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], webhook, path=["response"]) + assert_matches_type(Optional[WebhookDeleteResponse], webhook, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/alerting/test_policies.py b/tests/api_resources/alerting/test_policies.py index f79612d6358..3668367e996 100644 --- a/tests/api_resources/alerting/test_policies.py +++ b/tests/api_resources/alerting/test_policies.py @@ -10,10 +10,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.shared import UnnamedSchemaRef167 from cloudflare.types.alerting import ( AlertingPolicies, PolicyCreateResponse, + PolicyDeleteResponse, PolicyUpdateResponse, ) @@ -317,7 +317,7 @@ def test_method_delete(self, client: Cloudflare) -> None: "0da2b59e-f118-439d-8097-bdfb215203c9", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(Optional[UnnamedSchemaRef167], policy, path=["response"]) + assert_matches_type(Optional[PolicyDeleteResponse], policy, path=["response"]) @pytest.mark.skip() @parametrize @@ -330,7 +330,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" policy = response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], policy, path=["response"]) + assert_matches_type(Optional[PolicyDeleteResponse], policy, path=["response"]) @pytest.mark.skip() @parametrize @@ -343,7 +343,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" policy = response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], policy, path=["response"]) + assert_matches_type(Optional[PolicyDeleteResponse], policy, path=["response"]) assert cast(Any, response.is_closed) is True @@ -712,7 +712,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None: "0da2b59e-f118-439d-8097-bdfb215203c9", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(Optional[UnnamedSchemaRef167], policy, path=["response"]) + assert_matches_type(Optional[PolicyDeleteResponse], policy, path=["response"]) @pytest.mark.skip() @parametrize @@ -725,7 +725,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" policy = await response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], policy, path=["response"]) + assert_matches_type(Optional[PolicyDeleteResponse], policy, path=["response"]) @pytest.mark.skip() @parametrize @@ -738,7 +738,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" policy = await response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], policy, path=["response"]) + assert_matches_type(Optional[PolicyDeleteResponse], policy, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/load_balancers/test_monitors.py b/tests/api_resources/load_balancers/test_monitors.py index 89de1a27886..662cd697a31 100644 --- a/tests/api_resources/load_balancers/test_monitors.py +++ b/tests/api_resources/load_balancers/test_monitors.py @@ -13,7 +13,7 @@ from cloudflare.types.load_balancers import ( MonitorDeleteResponse, ) -from cloudflare.types.user.load_balancers import LoadBalancingMonitor +from cloudflare.types.user.load_balancers import Monitor base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -28,7 +28,7 @@ def test_method_create(self, client: Cloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", expected_codes="2xx", ) - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -55,7 +55,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None: load_balancer_monitor_timeout=0, type="https", ) - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -68,7 +68,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" monitor = response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -81,7 +81,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) assert cast(Any, response.is_closed) is True @@ -102,7 +102,7 @@ def test_method_update(self, client: Cloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", expected_codes="2xx", ) - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -130,7 +130,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None: load_balancer_monitor_timeout=0, type="https", ) - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -144,7 +144,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" monitor = response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -158,7 +158,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) assert cast(Any, response.is_closed) is True @@ -185,7 +185,7 @@ def test_method_list(self, client: Cloudflare) -> None: monitor = client.load_balancers.monitors.list( account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(SyncSinglePage[LoadBalancingMonitor], monitor, path=["response"]) + assert_matches_type(SyncSinglePage[Monitor], monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -197,7 +197,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" monitor = response.parse() - assert_matches_type(SyncSinglePage[LoadBalancingMonitor], monitor, path=["response"]) + assert_matches_type(SyncSinglePage[Monitor], monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -209,7 +209,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = response.parse() - assert_matches_type(SyncSinglePage[LoadBalancingMonitor], monitor, path=["response"]) + assert_matches_type(SyncSinglePage[Monitor], monitor, path=["response"]) assert cast(Any, response.is_closed) is True @@ -286,7 +286,7 @@ def test_method_edit(self, client: Cloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", expected_codes="2xx", ) - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -314,7 +314,7 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None: load_balancer_monitor_timeout=0, type="https", ) - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -328,7 +328,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" monitor = response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -342,7 +342,7 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) assert cast(Any, response.is_closed) is True @@ -370,7 +370,7 @@ def test_method_get(self, client: Cloudflare) -> None: "f1aba936b94213e5b8dca0c0dbf1f9cc", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -383,7 +383,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" monitor = response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -396,7 +396,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) assert cast(Any, response.is_closed) is True @@ -426,7 +426,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", expected_codes="2xx", ) - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -453,7 +453,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare load_balancer_monitor_timeout=0, type="https", ) - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -466,7 +466,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" monitor = await response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -479,7 +479,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = await response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) assert cast(Any, response.is_closed) is True @@ -500,7 +500,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", expected_codes="2xx", ) - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -528,7 +528,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare load_balancer_monitor_timeout=0, type="https", ) - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -542,7 +542,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" monitor = await response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -556,7 +556,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = await response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) assert cast(Any, response.is_closed) is True @@ -583,7 +583,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None: monitor = await async_client.load_balancers.monitors.list( account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(AsyncSinglePage[LoadBalancingMonitor], monitor, path=["response"]) + assert_matches_type(AsyncSinglePage[Monitor], monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -595,7 +595,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" monitor = await response.parse() - assert_matches_type(AsyncSinglePage[LoadBalancingMonitor], monitor, path=["response"]) + assert_matches_type(AsyncSinglePage[Monitor], monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -607,7 +607,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = await response.parse() - assert_matches_type(AsyncSinglePage[LoadBalancingMonitor], monitor, path=["response"]) + assert_matches_type(AsyncSinglePage[Monitor], monitor, path=["response"]) assert cast(Any, response.is_closed) is True @@ -684,7 +684,7 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", expected_codes="2xx", ) - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -712,7 +712,7 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) load_balancer_monitor_timeout=0, type="https", ) - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -726,7 +726,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" monitor = await response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -740,7 +740,7 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = await response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) assert cast(Any, response.is_closed) is True @@ -768,7 +768,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None: "f1aba936b94213e5b8dca0c0dbf1f9cc", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -781,7 +781,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" monitor = await response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -794,7 +794,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = await response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/load_balancers/test_pools.py b/tests/api_resources/load_balancers/test_pools.py index c51a0dc6b33..75d188bc943 100644 --- a/tests/api_resources/load_balancers/test_pools.py +++ b/tests/api_resources/load_balancers/test_pools.py @@ -13,7 +13,7 @@ from cloudflare.types.load_balancers import ( PoolDeleteResponse, ) -from cloudflare.types.user.load_balancers import LoadBalancingPool +from cloudflare.types.user.load_balancers import Pool base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -29,7 +29,7 @@ def test_method_create(self, client: Cloudflare) -> None: name="primary-dc-1", origins=[{}, {}, {}], ) - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -88,7 +88,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None: }, origin_steering={"policy": "random"}, ) - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -102,7 +102,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" pool = response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -116,7 +116,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" pool = response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) assert cast(Any, response.is_closed) is True @@ -139,7 +139,7 @@ def test_method_update(self, client: Cloudflare) -> None: name="primary-dc-1", origins=[{}, {}, {}], ) - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -200,7 +200,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None: }, origin_steering={"policy": "random"}, ) - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -215,7 +215,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" pool = response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -230,7 +230,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" pool = response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) assert cast(Any, response.is_closed) is True @@ -259,7 +259,7 @@ def test_method_list(self, client: Cloudflare) -> None: pool = client.load_balancers.pools.list( account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(SyncSinglePage[LoadBalancingPool], pool, path=["response"]) + assert_matches_type(SyncSinglePage[Pool], pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -268,7 +268,7 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", monitor={}, ) - assert_matches_type(SyncSinglePage[LoadBalancingPool], pool, path=["response"]) + assert_matches_type(SyncSinglePage[Pool], pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -280,7 +280,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" pool = response.parse() - assert_matches_type(SyncSinglePage[LoadBalancingPool], pool, path=["response"]) + assert_matches_type(SyncSinglePage[Pool], pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -292,7 +292,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" pool = response.parse() - assert_matches_type(SyncSinglePage[LoadBalancingPool], pool, path=["response"]) + assert_matches_type(SyncSinglePage[Pool], pool, path=["response"]) assert cast(Any, response.is_closed) is True @@ -368,7 +368,7 @@ def test_method_edit(self, client: Cloudflare) -> None: "17b5962d775c646f3f9725cbc7a53df4", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -429,7 +429,7 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None: }, ], ) - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -442,7 +442,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" pool = response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -455,7 +455,7 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" pool = response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) assert cast(Any, response.is_closed) is True @@ -481,7 +481,7 @@ def test_method_get(self, client: Cloudflare) -> None: "17b5962d775c646f3f9725cbc7a53df4", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -494,7 +494,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" pool = response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -507,7 +507,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" pool = response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) assert cast(Any, response.is_closed) is True @@ -538,7 +538,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None: name="primary-dc-1", origins=[{}, {}, {}], ) - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -597,7 +597,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare }, origin_steering={"policy": "random"}, ) - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -611,7 +611,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" pool = await response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -625,7 +625,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" pool = await response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) assert cast(Any, response.is_closed) is True @@ -648,7 +648,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None: name="primary-dc-1", origins=[{}, {}, {}], ) - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -709,7 +709,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare }, origin_steering={"policy": "random"}, ) - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -724,7 +724,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" pool = await response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -739,7 +739,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" pool = await response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) assert cast(Any, response.is_closed) is True @@ -768,7 +768,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None: pool = await async_client.load_balancers.pools.list( account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(AsyncSinglePage[LoadBalancingPool], pool, path=["response"]) + assert_matches_type(AsyncSinglePage[Pool], pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -777,7 +777,7 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) account_id="023e105f4ecef8ad9ca31a8372d0c353", monitor={}, ) - assert_matches_type(AsyncSinglePage[LoadBalancingPool], pool, path=["response"]) + assert_matches_type(AsyncSinglePage[Pool], pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -789,7 +789,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" pool = await response.parse() - assert_matches_type(AsyncSinglePage[LoadBalancingPool], pool, path=["response"]) + assert_matches_type(AsyncSinglePage[Pool], pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -801,7 +801,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" pool = await response.parse() - assert_matches_type(AsyncSinglePage[LoadBalancingPool], pool, path=["response"]) + assert_matches_type(AsyncSinglePage[Pool], pool, path=["response"]) assert cast(Any, response.is_closed) is True @@ -877,7 +877,7 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None: "17b5962d775c646f3f9725cbc7a53df4", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -938,7 +938,7 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) }, ], ) - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -951,7 +951,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" pool = await response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -964,7 +964,7 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" pool = await response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) assert cast(Any, response.is_closed) is True @@ -990,7 +990,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None: "17b5962d775c646f3f9725cbc7a53df4", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -1003,7 +1003,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" pool = await response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -1016,7 +1016,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No assert response.http_request.headers.get("X-Stainless-Lang") == "python" pool = await response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/queues/test_consumers.py b/tests/api_resources/queues/test_consumers.py index e831cabfeb4..20b325cd82f 100644 --- a/tests/api_resources/queues/test_consumers.py +++ b/tests/api_resources/queues/test_consumers.py @@ -12,9 +12,9 @@ from cloudflare.types.queues import ( ConsumerGetResponse, ConsumerCreateResponse, + ConsumerDeleteResponse, ConsumerUpdateResponse, ) -from cloudflare.types.shared import UnnamedSchemaRef167 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -233,7 +233,7 @@ def test_method_delete(self, client: Cloudflare) -> None: queue_id="023e105f4ecef8ad9ca31a8372d0c353", body={}, ) - assert_matches_type(Optional[UnnamedSchemaRef167], consumer, path=["response"]) + assert_matches_type(Optional[ConsumerDeleteResponse], consumer, path=["response"]) @pytest.mark.skip() @parametrize @@ -248,7 +248,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" consumer = response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], consumer, path=["response"]) + assert_matches_type(Optional[ConsumerDeleteResponse], consumer, path=["response"]) @pytest.mark.skip() @parametrize @@ -263,7 +263,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" consumer = response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], consumer, path=["response"]) + assert_matches_type(Optional[ConsumerDeleteResponse], consumer, path=["response"]) assert cast(Any, response.is_closed) is True @@ -561,7 +561,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None: queue_id="023e105f4ecef8ad9ca31a8372d0c353", body={}, ) - assert_matches_type(Optional[UnnamedSchemaRef167], consumer, path=["response"]) + assert_matches_type(Optional[ConsumerDeleteResponse], consumer, path=["response"]) @pytest.mark.skip() @parametrize @@ -576,7 +576,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" consumer = await response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], consumer, path=["response"]) + assert_matches_type(Optional[ConsumerDeleteResponse], consumer, path=["response"]) @pytest.mark.skip() @parametrize @@ -591,7 +591,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" consumer = await response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], consumer, path=["response"]) + assert_matches_type(Optional[ConsumerDeleteResponse], consumer, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/test_queues.py b/tests/api_resources/test_queues.py index 3dc04598cdf..09a971a7f1c 100644 --- a/tests/api_resources/test_queues.py +++ b/tests/api_resources/test_queues.py @@ -13,9 +13,9 @@ QueueGetResponse, QueueListResponse, QueueCreateResponse, + QueueDeleteResponse, QueueUpdateResponse, ) -from cloudflare.types.shared import UnnamedSchemaRef167 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -176,7 +176,7 @@ def test_method_delete(self, client: Cloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", body={}, ) - assert_matches_type(Optional[UnnamedSchemaRef167], queue, path=["response"]) + assert_matches_type(Optional[QueueDeleteResponse], queue, path=["response"]) @pytest.mark.skip() @parametrize @@ -190,7 +190,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" queue = response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], queue, path=["response"]) + assert_matches_type(Optional[QueueDeleteResponse], queue, path=["response"]) @pytest.mark.skip() @parametrize @@ -204,7 +204,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" queue = response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], queue, path=["response"]) + assert_matches_type(Optional[QueueDeleteResponse], queue, path=["response"]) assert cast(Any, response.is_closed) is True @@ -434,7 +434,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", body={}, ) - assert_matches_type(Optional[UnnamedSchemaRef167], queue, path=["response"]) + assert_matches_type(Optional[QueueDeleteResponse], queue, path=["response"]) @pytest.mark.skip() @parametrize @@ -448,7 +448,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" queue = await response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], queue, path=["response"]) + assert_matches_type(Optional[QueueDeleteResponse], queue, path=["response"]) @pytest.mark.skip() @parametrize @@ -462,7 +462,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" queue = await response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], queue, path=["response"]) + assert_matches_type(Optional[QueueDeleteResponse], queue, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/user/firewall/test_access_rules.py b/tests/api_resources/user/firewall/test_access_rules.py index 508d5672b29..ff4ee06dfa8 100644 --- a/tests/api_resources/user/firewall/test_access_rules.py +++ b/tests/api_resources/user/firewall/test_access_rules.py @@ -11,7 +11,7 @@ from tests.utils import assert_matches_type from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray from cloudflare.types.user.firewall import ( - FirewallRule, + AccessRule, AccessRuleDeleteResponse, ) @@ -28,7 +28,7 @@ def test_method_create(self, client: Cloudflare) -> None: configuration={}, mode="challenge", ) - assert_matches_type(Optional[FirewallRule], access_rule, path=["response"]) + assert_matches_type(Optional[AccessRule], access_rule, path=["response"]) @pytest.mark.skip() @parametrize @@ -41,7 +41,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None: mode="challenge", notes="This rule is enabled because of an event that occurred on date X.", ) - assert_matches_type(Optional[FirewallRule], access_rule, path=["response"]) + assert_matches_type(Optional[AccessRule], access_rule, path=["response"]) @pytest.mark.skip() @parametrize @@ -54,7 +54,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" access_rule = response.parse() - assert_matches_type(Optional[FirewallRule], access_rule, path=["response"]) + assert_matches_type(Optional[AccessRule], access_rule, path=["response"]) @pytest.mark.skip() @parametrize @@ -67,7 +67,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" access_rule = response.parse() - assert_matches_type(Optional[FirewallRule], access_rule, path=["response"]) + assert_matches_type(Optional[AccessRule], access_rule, path=["response"]) assert cast(Any, response.is_closed) is True @@ -75,7 +75,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None: @parametrize def test_method_list(self, client: Cloudflare) -> None: access_rule = client.user.firewall.access_rules.list() - assert_matches_type(SyncV4PagePaginationArray[FirewallRule], access_rule, path=["response"]) + assert_matches_type(SyncV4PagePaginationArray[AccessRule], access_rule, path=["response"]) @pytest.mark.skip() @parametrize @@ -99,7 +99,7 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None: page=1, per_page=20, ) - assert_matches_type(SyncV4PagePaginationArray[FirewallRule], access_rule, path=["response"]) + assert_matches_type(SyncV4PagePaginationArray[AccessRule], access_rule, path=["response"]) @pytest.mark.skip() @parametrize @@ -109,7 +109,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" access_rule = response.parse() - assert_matches_type(SyncV4PagePaginationArray[FirewallRule], access_rule, path=["response"]) + assert_matches_type(SyncV4PagePaginationArray[AccessRule], access_rule, path=["response"]) @pytest.mark.skip() @parametrize @@ -119,7 +119,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" access_rule = response.parse() - assert_matches_type(SyncV4PagePaginationArray[FirewallRule], access_rule, path=["response"]) + assert_matches_type(SyncV4PagePaginationArray[AccessRule], access_rule, path=["response"]) assert cast(Any, response.is_closed) is True @@ -175,7 +175,7 @@ def test_method_edit(self, client: Cloudflare) -> None: access_rule = client.user.firewall.access_rules.edit( "92f17202ed8bd63d69a66b86a49a8f6b", ) - assert_matches_type(Optional[FirewallRule], access_rule, path=["response"]) + assert_matches_type(Optional[AccessRule], access_rule, path=["response"]) @pytest.mark.skip() @parametrize @@ -185,7 +185,7 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None: mode="challenge", notes="This rule is enabled because of an event that occurred on date X.", ) - assert_matches_type(Optional[FirewallRule], access_rule, path=["response"]) + assert_matches_type(Optional[AccessRule], access_rule, path=["response"]) @pytest.mark.skip() @parametrize @@ -197,7 +197,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" access_rule = response.parse() - assert_matches_type(Optional[FirewallRule], access_rule, path=["response"]) + assert_matches_type(Optional[AccessRule], access_rule, path=["response"]) @pytest.mark.skip() @parametrize @@ -209,7 +209,7 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" access_rule = response.parse() - assert_matches_type(Optional[FirewallRule], access_rule, path=["response"]) + assert_matches_type(Optional[AccessRule], access_rule, path=["response"]) assert cast(Any, response.is_closed) is True @@ -232,7 +232,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None: configuration={}, mode="challenge", ) - assert_matches_type(Optional[FirewallRule], access_rule, path=["response"]) + assert_matches_type(Optional[AccessRule], access_rule, path=["response"]) @pytest.mark.skip() @parametrize @@ -245,7 +245,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare mode="challenge", notes="This rule is enabled because of an event that occurred on date X.", ) - assert_matches_type(Optional[FirewallRule], access_rule, path=["response"]) + assert_matches_type(Optional[AccessRule], access_rule, path=["response"]) @pytest.mark.skip() @parametrize @@ -258,7 +258,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" access_rule = await response.parse() - assert_matches_type(Optional[FirewallRule], access_rule, path=["response"]) + assert_matches_type(Optional[AccessRule], access_rule, path=["response"]) @pytest.mark.skip() @parametrize @@ -271,7 +271,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" access_rule = await response.parse() - assert_matches_type(Optional[FirewallRule], access_rule, path=["response"]) + assert_matches_type(Optional[AccessRule], access_rule, path=["response"]) assert cast(Any, response.is_closed) is True @@ -279,7 +279,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> @parametrize async def test_method_list(self, async_client: AsyncCloudflare) -> None: access_rule = await async_client.user.firewall.access_rules.list() - assert_matches_type(AsyncV4PagePaginationArray[FirewallRule], access_rule, path=["response"]) + assert_matches_type(AsyncV4PagePaginationArray[AccessRule], access_rule, path=["response"]) @pytest.mark.skip() @parametrize @@ -303,7 +303,7 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) page=1, per_page=20, ) - assert_matches_type(AsyncV4PagePaginationArray[FirewallRule], access_rule, path=["response"]) + assert_matches_type(AsyncV4PagePaginationArray[AccessRule], access_rule, path=["response"]) @pytest.mark.skip() @parametrize @@ -313,7 +313,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" access_rule = await response.parse() - assert_matches_type(AsyncV4PagePaginationArray[FirewallRule], access_rule, path=["response"]) + assert_matches_type(AsyncV4PagePaginationArray[AccessRule], access_rule, path=["response"]) @pytest.mark.skip() @parametrize @@ -323,7 +323,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" access_rule = await response.parse() - assert_matches_type(AsyncV4PagePaginationArray[FirewallRule], access_rule, path=["response"]) + assert_matches_type(AsyncV4PagePaginationArray[AccessRule], access_rule, path=["response"]) assert cast(Any, response.is_closed) is True @@ -379,7 +379,7 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None: access_rule = await async_client.user.firewall.access_rules.edit( "92f17202ed8bd63d69a66b86a49a8f6b", ) - assert_matches_type(Optional[FirewallRule], access_rule, path=["response"]) + assert_matches_type(Optional[AccessRule], access_rule, path=["response"]) @pytest.mark.skip() @parametrize @@ -389,7 +389,7 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) mode="challenge", notes="This rule is enabled because of an event that occurred on date X.", ) - assert_matches_type(Optional[FirewallRule], access_rule, path=["response"]) + assert_matches_type(Optional[AccessRule], access_rule, path=["response"]) @pytest.mark.skip() @parametrize @@ -401,7 +401,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" access_rule = await response.parse() - assert_matches_type(Optional[FirewallRule], access_rule, path=["response"]) + assert_matches_type(Optional[AccessRule], access_rule, path=["response"]) @pytest.mark.skip() @parametrize @@ -413,7 +413,7 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" access_rule = await response.parse() - assert_matches_type(Optional[FirewallRule], access_rule, path=["response"]) + assert_matches_type(Optional[AccessRule], access_rule, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/user/load_balancers/test_monitors.py b/tests/api_resources/user/load_balancers/test_monitors.py index 290acdecad4..5050fb3346a 100644 --- a/tests/api_resources/user/load_balancers/test_monitors.py +++ b/tests/api_resources/user/load_balancers/test_monitors.py @@ -11,7 +11,7 @@ from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage from cloudflare.types.user.load_balancers import ( - LoadBalancingMonitor, + Monitor, MonitorDeleteResponse, MonitorPreviewResponse, MonitorReferencesResponse, @@ -29,7 +29,7 @@ def test_method_create(self, client: Cloudflare) -> None: monitor = client.user.load_balancers.monitors.create( expected_codes="2xx", ) - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -55,7 +55,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None: load_balancer_monitor_timeout=0, type="https", ) - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -67,7 +67,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" monitor = response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -79,7 +79,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) assert cast(Any, response.is_closed) is True @@ -90,7 +90,7 @@ def test_method_update(self, client: Cloudflare) -> None: "f1aba936b94213e5b8dca0c0dbf1f9cc", expected_codes="2xx", ) - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -117,7 +117,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None: load_balancer_monitor_timeout=0, type="https", ) - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -130,7 +130,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" monitor = response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -143,7 +143,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) assert cast(Any, response.is_closed) is True @@ -160,7 +160,7 @@ def test_path_params_update(self, client: Cloudflare) -> None: @parametrize def test_method_list(self, client: Cloudflare) -> None: monitor = client.user.load_balancers.monitors.list() - assert_matches_type(SyncSinglePage[LoadBalancingMonitor], monitor, path=["response"]) + assert_matches_type(SyncSinglePage[Monitor], monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -170,7 +170,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" monitor = response.parse() - assert_matches_type(SyncSinglePage[LoadBalancingMonitor], monitor, path=["response"]) + assert_matches_type(SyncSinglePage[Monitor], monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -180,7 +180,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = response.parse() - assert_matches_type(SyncSinglePage[LoadBalancingMonitor], monitor, path=["response"]) + assert_matches_type(SyncSinglePage[Monitor], monitor, path=["response"]) assert cast(Any, response.is_closed) is True @@ -237,7 +237,7 @@ def test_method_edit(self, client: Cloudflare) -> None: "f1aba936b94213e5b8dca0c0dbf1f9cc", expected_codes="2xx", ) - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -264,7 +264,7 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None: load_balancer_monitor_timeout=0, type="https", ) - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -277,7 +277,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" monitor = response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -290,7 +290,7 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) assert cast(Any, response.is_closed) is True @@ -309,7 +309,7 @@ def test_method_get(self, client: Cloudflare) -> None: monitor = client.user.load_balancers.monitors.get( "f1aba936b94213e5b8dca0c0dbf1f9cc", ) - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -321,7 +321,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" monitor = response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -333,7 +333,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) assert cast(Any, response.is_closed) is True @@ -470,7 +470,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None: monitor = await async_client.user.load_balancers.monitors.create( expected_codes="2xx", ) - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -496,7 +496,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare load_balancer_monitor_timeout=0, type="https", ) - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -508,7 +508,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" monitor = await response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -520,7 +520,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = await response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) assert cast(Any, response.is_closed) is True @@ -531,7 +531,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None: "f1aba936b94213e5b8dca0c0dbf1f9cc", expected_codes="2xx", ) - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -558,7 +558,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare load_balancer_monitor_timeout=0, type="https", ) - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -571,7 +571,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" monitor = await response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -584,7 +584,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = await response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) assert cast(Any, response.is_closed) is True @@ -601,7 +601,7 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None: @parametrize async def test_method_list(self, async_client: AsyncCloudflare) -> None: monitor = await async_client.user.load_balancers.monitors.list() - assert_matches_type(AsyncSinglePage[LoadBalancingMonitor], monitor, path=["response"]) + assert_matches_type(AsyncSinglePage[Monitor], monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -611,7 +611,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" monitor = await response.parse() - assert_matches_type(AsyncSinglePage[LoadBalancingMonitor], monitor, path=["response"]) + assert_matches_type(AsyncSinglePage[Monitor], monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -621,7 +621,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = await response.parse() - assert_matches_type(AsyncSinglePage[LoadBalancingMonitor], monitor, path=["response"]) + assert_matches_type(AsyncSinglePage[Monitor], monitor, path=["response"]) assert cast(Any, response.is_closed) is True @@ -678,7 +678,7 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None: "f1aba936b94213e5b8dca0c0dbf1f9cc", expected_codes="2xx", ) - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -705,7 +705,7 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) load_balancer_monitor_timeout=0, type="https", ) - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -718,7 +718,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" monitor = await response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -731,7 +731,7 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = await response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) assert cast(Any, response.is_closed) is True @@ -750,7 +750,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None: monitor = await async_client.user.load_balancers.monitors.get( "f1aba936b94213e5b8dca0c0dbf1f9cc", ) - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -762,7 +762,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" monitor = await response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -774,7 +774,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = await response.parse() - assert_matches_type(LoadBalancingMonitor, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/user/load_balancers/test_pools.py b/tests/api_resources/user/load_balancers/test_pools.py index 8178c368642..32c46bceded 100644 --- a/tests/api_resources/user/load_balancers/test_pools.py +++ b/tests/api_resources/user/load_balancers/test_pools.py @@ -11,7 +11,7 @@ from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage from cloudflare.types.user.load_balancers import ( - LoadBalancingPool, + Pool, PoolDeleteResponse, PoolHealthResponse, PoolPreviewResponse, @@ -31,7 +31,7 @@ def test_method_create(self, client: Cloudflare) -> None: name="primary-dc-1", origins=[{}, {}, {}], ) - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -90,7 +90,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None: }, origin_steering={"policy": "random"}, ) - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -103,7 +103,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" pool = response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -116,7 +116,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" pool = response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) assert cast(Any, response.is_closed) is True @@ -128,7 +128,7 @@ def test_method_update(self, client: Cloudflare) -> None: name="primary-dc-1", origins=[{}, {}, {}], ) - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -188,7 +188,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None: }, origin_steering={"policy": "random"}, ) - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -202,7 +202,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" pool = response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -216,7 +216,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" pool = response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) assert cast(Any, response.is_closed) is True @@ -234,7 +234,7 @@ def test_path_params_update(self, client: Cloudflare) -> None: @parametrize def test_method_list(self, client: Cloudflare) -> None: pool = client.user.load_balancers.pools.list() - assert_matches_type(SyncSinglePage[LoadBalancingPool], pool, path=["response"]) + assert_matches_type(SyncSinglePage[Pool], pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -242,7 +242,7 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None: pool = client.user.load_balancers.pools.list( monitor={}, ) - assert_matches_type(SyncSinglePage[LoadBalancingPool], pool, path=["response"]) + assert_matches_type(SyncSinglePage[Pool], pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -252,7 +252,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" pool = response.parse() - assert_matches_type(SyncSinglePage[LoadBalancingPool], pool, path=["response"]) + assert_matches_type(SyncSinglePage[Pool], pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -262,7 +262,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" pool = response.parse() - assert_matches_type(SyncSinglePage[LoadBalancingPool], pool, path=["response"]) + assert_matches_type(SyncSinglePage[Pool], pool, path=["response"]) assert cast(Any, response.is_closed) is True @@ -318,7 +318,7 @@ def test_method_edit(self, client: Cloudflare) -> None: pool = client.user.load_balancers.pools.edit( "17b5962d775c646f3f9725cbc7a53df4", ) - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -378,7 +378,7 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None: }, ], ) - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -390,7 +390,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" pool = response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -402,7 +402,7 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" pool = response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) assert cast(Any, response.is_closed) is True @@ -420,7 +420,7 @@ def test_method_get(self, client: Cloudflare) -> None: pool = client.user.load_balancers.pools.get( "17b5962d775c646f3f9725cbc7a53df4", ) - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -432,7 +432,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" pool = response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -444,7 +444,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" pool = response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) assert cast(Any, response.is_closed) is True @@ -624,7 +624,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None: name="primary-dc-1", origins=[{}, {}, {}], ) - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -683,7 +683,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare }, origin_steering={"policy": "random"}, ) - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -696,7 +696,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" pool = await response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -709,7 +709,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" pool = await response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) assert cast(Any, response.is_closed) is True @@ -721,7 +721,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None: name="primary-dc-1", origins=[{}, {}, {}], ) - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -781,7 +781,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare }, origin_steering={"policy": "random"}, ) - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -795,7 +795,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" pool = await response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -809,7 +809,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" pool = await response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) assert cast(Any, response.is_closed) is True @@ -827,7 +827,7 @@ async def test_path_params_update(self, async_client: AsyncCloudflare) -> None: @parametrize async def test_method_list(self, async_client: AsyncCloudflare) -> None: pool = await async_client.user.load_balancers.pools.list() - assert_matches_type(AsyncSinglePage[LoadBalancingPool], pool, path=["response"]) + assert_matches_type(AsyncSinglePage[Pool], pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -835,7 +835,7 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) pool = await async_client.user.load_balancers.pools.list( monitor={}, ) - assert_matches_type(AsyncSinglePage[LoadBalancingPool], pool, path=["response"]) + assert_matches_type(AsyncSinglePage[Pool], pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -845,7 +845,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" pool = await response.parse() - assert_matches_type(AsyncSinglePage[LoadBalancingPool], pool, path=["response"]) + assert_matches_type(AsyncSinglePage[Pool], pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -855,7 +855,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" pool = await response.parse() - assert_matches_type(AsyncSinglePage[LoadBalancingPool], pool, path=["response"]) + assert_matches_type(AsyncSinglePage[Pool], pool, path=["response"]) assert cast(Any, response.is_closed) is True @@ -911,7 +911,7 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None: pool = await async_client.user.load_balancers.pools.edit( "17b5962d775c646f3f9725cbc7a53df4", ) - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -971,7 +971,7 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) }, ], ) - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -983,7 +983,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" pool = await response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -995,7 +995,7 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" pool = await response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) assert cast(Any, response.is_closed) is True @@ -1013,7 +1013,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None: pool = await async_client.user.load_balancers.pools.get( "17b5962d775c646f3f9725cbc7a53df4", ) - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -1025,7 +1025,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" pool = await response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) @pytest.mark.skip() @parametrize @@ -1037,7 +1037,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No assert response.http_request.headers.get("X-Stainless-Lang") == "python" pool = await response.parse() - assert_matches_type(LoadBalancingPool, pool, path=["response"]) + assert_matches_type(Pool, pool, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/zones/test_custom_nameservers.py b/tests/api_resources/zones/test_custom_nameservers.py index d66d6e22f6e..0d059a2b75b 100644 --- a/tests/api_resources/zones/test_custom_nameservers.py +++ b/tests/api_resources/zones/test_custom_nameservers.py @@ -9,8 +9,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones import CustomNameserverUpdateResponse -from cloudflare.types.shared import UnnamedSchemaRef167 +from cloudflare.types.zones import ( + CustomNameserverGetResponse, + CustomNameserverUpdateResponse, +) base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -76,7 +78,7 @@ def test_method_get(self, client: Cloudflare) -> None: custom_nameserver = client.zones.custom_nameservers.get( zone_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(Optional[UnnamedSchemaRef167], custom_nameserver, path=["response"]) + assert_matches_type(Optional[CustomNameserverGetResponse], custom_nameserver, path=["response"]) @pytest.mark.skip() @parametrize @@ -88,7 +90,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" custom_nameserver = response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], custom_nameserver, path=["response"]) + assert_matches_type(Optional[CustomNameserverGetResponse], custom_nameserver, path=["response"]) @pytest.mark.skip() @parametrize @@ -100,7 +102,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" custom_nameserver = response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], custom_nameserver, path=["response"]) + assert_matches_type(Optional[CustomNameserverGetResponse], custom_nameserver, path=["response"]) assert cast(Any, response.is_closed) is True @@ -174,7 +176,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None: custom_nameserver = await async_client.zones.custom_nameservers.get( zone_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(Optional[UnnamedSchemaRef167], custom_nameserver, path=["response"]) + assert_matches_type(Optional[CustomNameserverGetResponse], custom_nameserver, path=["response"]) @pytest.mark.skip() @parametrize @@ -186,7 +188,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" custom_nameserver = await response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], custom_nameserver, path=["response"]) + assert_matches_type(Optional[CustomNameserverGetResponse], custom_nameserver, path=["response"]) @pytest.mark.skip() @parametrize @@ -198,7 +200,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No assert response.http_request.headers.get("X-Stainless-Lang") == "python" custom_nameserver = await response.parse() - assert_matches_type(Optional[UnnamedSchemaRef167], custom_nameserver, path=["response"]) + assert_matches_type(Optional[CustomNameserverGetResponse], custom_nameserver, path=["response"]) assert cast(Any, response.is_closed) is True