From 9c065ca720f52189a263828a9fa33fb863ffcc59 Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 22:28:25 +0000 Subject: [PATCH] feat(api): OpenAPI spec update via Stainless API (#359) --- src/cloudflare/_exceptions.py | 2 +- src/cloudflare/resources/accounts/accounts.py | 4 +- src/cloudflare/resources/accounts/members.py | 15 ++---- src/cloudflare/resources/accounts/roles.py | 4 +- src/cloudflare/resources/acm/total_tls.py | 4 +- .../addressing/address_maps/accounts.py | 9 ++-- .../addressing/address_maps/address_maps.py | 14 ++---- .../resources/addressing/address_maps/ips.py | 4 +- .../addressing/address_maps/zones.py | 9 ++-- .../addressing/loa_documents/loa_documents.py | 3 +- .../addressing/prefixes/bgp/bindings.py | 4 +- .../addressing/prefixes/bgp/prefixes.py | 3 +- .../addressing/prefixes/bgp/statuses.py | 4 +- .../addressing/prefixes/delegations.py | 8 +-- .../resources/addressing/prefixes/prefixes.py | 10 ++-- .../resources/addressing/services.py | 2 +- .../resources/alerting/available_alerts.py | 2 +- .../alerting/destinations/eligible.py | 2 +- .../alerting/destinations/pagerduty.py | 10 ++-- .../alerting/destinations/webhooks.py | 12 ++--- src/cloudflare/resources/alerting/history.py | 3 +- src/cloudflare/resources/alerting/policies.py | 17 +++---- .../resources/argo/smart_routing.py | 4 +- .../resources/argo/tiered_caching.py | 4 +- src/cloudflare/resources/audit_logs.py | 2 +- src/cloudflare/resources/billing/profiles.py | 2 +- src/cloudflare/resources/bot_management.py | 4 +- src/cloudflare/resources/brand_protection.py | 4 +- src/cloudflare/resources/cache/cache.py | 3 +- .../resources/cache/cache_reserve.py | 13 ++--- .../resources/cache/regional_tiered_cache.py | 8 ++- .../resources/cache/smart_tiered_cache.py | 11 ++-- src/cloudflare/resources/cache/variants.py | 11 ++-- src/cloudflare/resources/calls.py | 4 +- .../hostname_associations.py | 11 ++-- .../resources/challenges/widgets.py | 6 +-- .../resources/client_certificates.py | 7 +-- .../cloudforce_one/requests/message.py | 12 ++--- .../cloudforce_one/requests/priority.py | 14 +++--- .../cloudforce_one/requests/requests.py | 18 +++---- .../custom_certificates.py | 13 ++--- .../custom_certificates/prioritize.py | 3 +- .../custom_hostnames/custom_hostnames.py | 10 ++-- .../custom_hostnames/fallback_origin.py | 11 ++-- .../resources/custom_nameservers.py | 10 ++-- src/cloudflare/resources/d1/database.py | 16 +++--- .../resources/dcv_delegation/uuid.py | 2 +- .../resources/diagnostics/traceroutes.py | 3 +- .../dns/analytics/reports/bytimes.py | 3 +- .../dns/analytics/reports/reports.py | 3 +- .../dns/firewall/analytics/reports/bytimes.py | 2 +- .../dns/firewall/analytics/reports/reports.py | 2 +- .../resources/dns/firewall/firewall.py | 10 ++-- src/cloudflare/resources/dns/records.py | 12 ++--- src/cloudflare/resources/dnssec.py | 4 +- .../durable_objects/namespaces/namespaces.py | 2 +- .../durable_objects/namespaces/objects.py | 3 +- .../resources/email_routing/addresses.py | 3 +- src/cloudflare/resources/email_routing/dns.py | 2 +- .../resources/email_routing/email_routing.py | 3 +- .../email_routing/rules/catch_alls.py | 12 ++--- .../resources/email_routing/rules/rules.py | 12 ++--- .../r2/configuration/configuration.py | 2 +- .../r2/configuration/queues.py | 8 ++- src/cloudflare/resources/filters.py | 11 ++-- .../resources/firewall/access_rules.py | 8 +-- .../resources/firewall/lockdowns.py | 4 +- src/cloudflare/resources/firewall/rules.py | 6 +-- src/cloudflare/resources/firewall/ua_rules.py | 17 +++---- .../resources/firewall/waf/overrides.py | 4 +- .../resources/firewall/waf/packages/groups.py | 11 ++-- .../firewall/waf/packages/packages.py | 4 +- .../resources/firewall/waf/packages/rules.py | 11 ++-- .../resources/healthchecks/healthchecks.py | 10 ++-- .../resources/healthchecks/previews.py | 15 +++--- .../resources/hostnames/settings/tls.py | 12 ++--- .../resources/hyperdrive/configs.py | 12 ++--- src/cloudflare/resources/images/v1/keys.py | 4 +- src/cloudflare/resources/images/v1/stats.py | 2 +- src/cloudflare/resources/images/v1/v1.py | 13 ++--- .../resources/images/v1/variants.py | 16 +++--- .../resources/images/v2/direct_uploads.py | 3 +- src/cloudflare/resources/images/v2/v2.py | 3 +- src/cloudflare/resources/intel/asn/subnets.py | 4 +- .../attack_surface_report/issue_types.py | 2 +- .../intel/attack_surface_report/issues.py | 20 ++++---- src/cloudflare/resources/intel/dns.py | 3 +- .../resources/intel/domain_history.py | 3 +- .../resources/intel/domains/bulks.py | 3 +- .../resources/intel/domains/domains.py | 3 +- .../intel/indicator_feeds/indicator_feeds.py | 13 ++--- .../intel/indicator_feeds/permissions.py | 11 ++-- src/cloudflare/resources/intel/ip_lists.py | 2 +- src/cloudflare/resources/intel/ips.py | 3 +- .../resources/intel/miscategorizations.py | 3 +- src/cloudflare/resources/intel/sinkholes.py | 2 +- src/cloudflare/resources/ips.py | 3 +- .../resources/keyless_certificates.py | 7 +-- .../resources/kv/namespaces/bulk.py | 4 +- .../resources/kv/namespaces/keys.py | 3 +- .../resources/kv/namespaces/namespaces.py | 6 +-- .../resources/kv/namespaces/values.py | 9 ++-- .../load_balancers/load_balancers.py | 16 +++--- .../load_balancers/monitors/monitors.py | 4 +- .../load_balancers/monitors/previews.py | 3 +- .../load_balancers/monitors/references.py | 2 +- .../resources/load_balancers/pools/health.py | 4 +- .../resources/load_balancers/pools/pools.py | 14 +++--- .../load_balancers/pools/references.py | 2 +- .../resources/load_balancers/previews.py | 2 +- .../resources/load_balancers/regions.py | 4 +- .../resources/load_balancers/searches.py | 3 +- .../resources/logpush/datasets/jobs.py | 2 +- src/cloudflare/resources/logpush/edge.py | 4 +- src/cloudflare/resources/logpush/jobs.py | 10 ++-- src/cloudflare/resources/logpush/ownership.py | 9 ++-- src/cloudflare/resources/logpush/validate.py | 9 ++-- .../resources/logs/control/cmb/config.py | 3 +- .../resources/logs/control/retention/flag.py | 4 +- src/cloudflare/resources/logs/rayid.py | 3 +- .../resources/logs/received/fields.py | 2 +- .../resources/logs/received/received.py | 3 +- .../configs/configs.py | 2 +- .../magic_network_monitoring/configs/full.py | 2 +- .../rules/advertisements.py | 3 +- .../magic_network_monitoring/rules/rules.py | 2 +- .../magic_transit/cf_interconnects.py | 10 ++-- .../resources/magic_transit/gre_tunnels.py | 12 ++--- .../resources/magic_transit/ipsec_tunnels.py | 14 +++--- .../resources/magic_transit/routes.py | 14 +++--- .../resources/magic_transit/sites/acls.py | 12 ++--- .../resources/magic_transit/sites/lans.py | 10 ++-- .../resources/magic_transit/sites/sites.py | 4 +- .../resources/magic_transit/sites/wans.py | 12 ++--- src/cloudflare/resources/managed_headers.py | 10 ++-- src/cloudflare/resources/memberships.py | 14 ++---- .../mtls_certificates/associations.py | 2 +- .../mtls_certificates/mtls_certificates.py | 9 ++-- .../resources/origin_ca_certificates.py | 8 +-- .../origin_post_quantum_encryption.py | 6 ++- .../hostnames/certificates.py | 13 ++--- .../hostnames/hostnames.py | 4 +- .../origin_tls_client_auth.py | 13 ++--- .../origin_tls_client_auth/settings.py | 4 +- .../resources/page_shield/connections.py | 3 +- .../resources/page_shield/page_shield.py | 4 +- .../resources/page_shield/policies.py | 3 +- .../resources/page_shield/scripts.py | 4 +- .../resources/pagerules/pagerules.py | 16 +++--- .../resources/pagerules/settings.py | 2 +- .../pages/projects/deployments/deployments.py | 2 +- .../projects/deployments/history/logs.py | 2 +- .../resources/pages/projects/domains.py | 12 ++--- .../resources/pages/projects/projects.py | 16 +++--- src/cloudflare/resources/pcaps/ownership.py | 4 +- src/cloudflare/resources/pcaps/pcaps.py | 12 ++--- src/cloudflare/resources/plans.py | 2 +- src/cloudflare/resources/queues/consumers.py | 14 ++---- src/cloudflare/resources/queues/messages.py | 4 +- src/cloudflare/resources/queues/queues.py | 14 ++---- src/cloudflare/resources/r2/buckets.py | 3 +- src/cloudflare/resources/r2/sippy.py | 4 +- .../resources/radar/annotations/outages.py | 9 ++-- src/cloudflare/resources/radar/as112/as112.py | 3 +- .../resources/radar/as112/summary.py | 12 ++--- .../radar/as112/timeseries_groups.py | 12 ++--- src/cloudflare/resources/radar/as112/top.py | 15 ++---- .../resources/radar/attacks/layer3/layer3.py | 3 +- .../resources/radar/attacks/layer3/summary.py | 12 ++--- .../radar/attacks/layer3/timeseries_groups.py | 16 +++--- .../radar/attacks/layer3/top/locations.py | 9 ++-- .../resources/radar/attacks/layer3/top/top.py | 12 ++--- .../resources/radar/attacks/layer7/layer7.py | 3 +- .../resources/radar/attacks/layer7/summary.py | 12 ++--- .../radar/attacks/layer7/timeseries_groups.py | 18 ++++--- .../radar/attacks/layer7/top/ases.py | 3 +- .../radar/attacks/layer7/top/locations.py | 9 ++-- .../resources/radar/attacks/layer7/top/top.py | 12 ++--- src/cloudflare/resources/radar/bgp/bgp.py | 3 +- .../resources/radar/bgp/hijacks/events.py | 3 +- .../resources/radar/bgp/leaks/events.py | 3 +- src/cloudflare/resources/radar/bgp/routes.py | 15 ++---- .../resources/radar/bgp/top/ases.py | 4 +- src/cloudflare/resources/radar/bgp/top/top.py | 3 +- .../resources/radar/connection_tampering.py | 9 ++-- src/cloudflare/resources/radar/datasets.py | 10 ++-- src/cloudflare/resources/radar/dns/top.py | 4 +- .../resources/radar/email/routing/summary.py | 12 ++--- .../radar/email/routing/timeseries_groups.py | 12 ++--- .../resources/radar/email/security/summary.py | 18 +++---- .../radar/email/security/timeseries_groups.py | 20 ++++---- .../email/security/top/tlds/malicious.py | 3 +- .../radar/email/security/top/tlds/spam.py | 3 +- .../radar/email/security/top/tlds/spoof.py | 3 +- .../radar/email/security/top/tlds/tlds.py | 3 +- .../resources/radar/entities/asns.py | 15 ++---- .../resources/radar/entities/entities.py | 3 +- .../resources/radar/entities/locations.py | 9 ++-- .../resources/radar/http/ases/ases.py | 3 +- .../resources/radar/http/ases/bot_class.py | 3 +- .../resources/radar/http/ases/device_type.py | 3 +- .../resources/radar/http/ases/http_method.py | 3 +- .../radar/http/ases/http_protocol.py | 3 +- .../resources/radar/http/ases/ip_version.py | 3 +- .../resources/radar/http/ases/os.py | 3 +- .../resources/radar/http/ases/tls_version.py | 3 +- .../radar/http/locations/bot_class.py | 3 +- .../radar/http/locations/device_type.py | 3 +- .../radar/http/locations/http_method.py | 3 +- .../radar/http/locations/http_protocol.py | 3 +- .../radar/http/locations/ip_version.py | 3 +- .../radar/http/locations/locations.py | 3 +- .../resources/radar/http/locations/os.py | 3 +- .../radar/http/locations/tls_version.py | 3 +- .../resources/radar/http/summary.py | 14 +++--- .../resources/radar/http/timeseries_groups.py | 18 +++---- src/cloudflare/resources/radar/http/top.py | 9 ++-- .../resources/radar/netflows/netflows.py | 3 +- .../resources/radar/netflows/top.py | 4 +- src/cloudflare/resources/radar/quality/iqi.py | 9 ++-- .../resources/radar/quality/speed/speed.py | 9 ++-- .../resources/radar/quality/speed/top.py | 4 +- .../resources/radar/ranking/domain.py | 3 +- .../resources/radar/ranking/ranking.py | 9 ++-- src/cloudflare/resources/radar/search.py | 3 +- .../radar/traffic_anomalies/locations.py | 3 +- .../traffic_anomalies/traffic_anomalies.py | 3 +- .../resources/radar/verified_bots/top.py | 4 +- src/cloudflare/resources/rate_limits.py | 10 ++-- src/cloudflare/resources/rate_plans.py | 2 +- src/cloudflare/resources/registrar/domains.py | 5 +- .../resources/request_tracers/traces.py | 3 +- .../resources/rules/lists/bulk_operations.py | 2 +- src/cloudflare/resources/rules/lists/items.py | 15 ++---- src/cloudflare/resources/rules/lists/lists.py | 4 +- .../resources/rulesets/phases/phases.py | 4 +- .../resources/rulesets/phases/versions.py | 4 +- src/cloudflare/resources/rulesets/rules.py | 13 ++--- src/cloudflare/resources/rulesets/rulesets.py | 13 ++--- .../resources/rulesets/versions/by_tag.py | 2 +- .../resources/rulesets/versions/versions.py | 3 +- src/cloudflare/resources/rum/rules.py | 5 +- src/cloudflare/resources/rum/site_info.py | 10 ++-- .../resources/secondary_dns/acls.py | 4 +- .../resources/secondary_dns/force_axfr.py | 3 +- .../resources/secondary_dns/incoming.py | 14 ++---- .../secondary_dns/outgoing/outgoing.py | 14 +++--- .../secondary_dns/outgoing/status.py | 2 +- .../resources/secondary_dns/peers.py | 4 +- .../resources/secondary_dns/tsigs.py | 4 +- src/cloudflare/resources/snippets/rules.py | 4 +- src/cloudflare/resources/snippets/snippets.py | 4 +- .../spectrum/analytics/aggregates/currents.py | 3 +- .../spectrum/analytics/events/bytimes.py | 5 +- .../spectrum/analytics/events/summaries.py | 5 +- src/cloudflare/resources/spectrum/apps.py | 16 +++--- .../resources/speed/availabilities.py | 2 +- src/cloudflare/resources/speed/pages.py | 2 +- src/cloudflare/resources/speed/schedule.py | 3 +- src/cloudflare/resources/speed/speed.py | 12 ++--- src/cloudflare/resources/speed/tests.py | 12 ++--- src/cloudflare/resources/ssl/analyze.py | 4 +- .../certificate_packs/certificate_packs.py | 12 ++--- .../resources/ssl/certificate_packs/order.py | 5 +- .../resources/ssl/certificate_packs/quota.py | 2 +- .../resources/ssl/recommendations.py | 2 +- .../resources/ssl/universal/settings.py | 3 +- src/cloudflare/resources/ssl/verification.py | 9 ++-- src/cloudflare/resources/storage/analytics.py | 4 +- .../resources/stream/audio_tracks.py | 11 ++-- .../resources/stream/captions/captions.py | 2 +- .../stream/captions/language/language.py | 5 +- src/cloudflare/resources/stream/clip.py | 4 +- src/cloudflare/resources/stream/copy.py | 4 +- .../resources/stream/direct_upload.py | 4 +- src/cloudflare/resources/stream/downloads.py | 5 +- src/cloudflare/resources/stream/keys.py | 4 +- .../stream/live_inputs/live_inputs.py | 4 +- .../resources/stream/live_inputs/outputs.py | 3 +- src/cloudflare/resources/stream/stream.py | 3 +- src/cloudflare/resources/stream/token.py | 3 +- src/cloudflare/resources/stream/videos.py | 3 +- src/cloudflare/resources/stream/watermarks.py | 4 +- src/cloudflare/resources/stream/webhooks.py | 11 ++-- src/cloudflare/resources/subscriptions.py | 24 ++++----- src/cloudflare/resources/url_normalization.py | 8 ++- src/cloudflare/resources/url_scanner/scans.py | 11 ++-- .../resources/url_scanner/url_scanner.py | 3 +- src/cloudflare/resources/user/audit_logs.py | 2 +- .../resources/user/billing/history.py | 3 +- .../resources/user/billing/profile.py | 2 +- src/cloudflare/resources/user/invites.py | 5 +- .../resources/user/organizations.py | 11 ++-- .../resources/user/subscriptions.py | 14 +++--- .../resources/user/tokens/tokens.py | 19 +++---- src/cloudflare/resources/user/tokens/value.py | 3 +- src/cloudflare/resources/user/user.py | 4 +- src/cloudflare/resources/vectorize/indexes.py | 12 ++--- .../resources/waiting_rooms/events/details.py | 2 +- .../resources/waiting_rooms/events/events.py | 4 +- .../resources/waiting_rooms/page.py | 3 +- .../resources/waiting_rooms/rules.py | 17 +++---- .../resources/waiting_rooms/settings.py | 11 ++-- .../resources/waiting_rooms/statuses.py | 2 +- .../resources/waiting_rooms/waiting_rooms.py | 8 +-- src/cloudflare/resources/warp_connector.py | 12 ++--- .../resources/web3/hostnames/hostnames.py | 10 ++-- .../content_lists/content_lists.py | 3 +- .../content_lists/entries.py | 10 ++-- .../resources/workers/account_settings.py | 4 +- src/cloudflare/resources/workers/ai.py | 3 +- src/cloudflare/resources/workers/domains.py | 3 +- .../resources/workers/scripts/content.py | 3 +- .../resources/workers/scripts/deployments.py | 10 ++-- .../resources/workers/scripts/schedules.py | 4 +- .../resources/workers/scripts/scripts.py | 3 +- .../resources/workers/scripts/settings.py | 5 +- .../resources/workers/scripts/tail.py | 11 ++-- .../resources/workers/scripts/versions.py | 10 ++-- .../resources/workers/subdomains.py | 4 +- .../dispatch/namespaces/namespaces.py | 10 ++-- .../dispatch/namespaces/scripts/bindings.py | 2 +- .../dispatch/namespaces/scripts/content.py | 3 +- .../dispatch/namespaces/scripts/scripts.py | 37 +++++++------- .../dispatch/namespaces/scripts/secrets.py | 8 ++- .../dispatch/namespaces/scripts/settings.py | 8 ++- .../dispatch/namespaces/scripts/tags.py | 8 ++- .../access/applications/applications.py | 19 +++---- .../zero_trust/access/applications/cas.py | 5 +- .../access/applications/policies.py | 13 ++--- .../access/applications/user_policy_checks.py | 4 +- .../resources/zero_trust/access/bookmarks.py | 10 ++-- .../access/certificates/certificates.py | 11 ++-- .../access/certificates/settings.py | 10 ++-- .../zero_trust/access/custom_pages.py | 11 ++-- .../resources/zero_trust/access/groups.py | 6 ++- .../resources/zero_trust/access/keys.py | 5 +- .../zero_trust/access/logs/access_requests.py | 2 +- .../zero_trust/access/service_tokens.py | 11 ++-- .../resources/zero_trust/access/tags.py | 4 +- .../access/users/active_sessions.py | 3 +- .../zero_trust/access/users/failed_logins.py | 2 +- .../access/users/last_seen_identity.py | 2 +- .../zero_trust/access/users/users.py | 2 +- .../zero_trust/connectivity_settings.py | 8 ++- .../resources/zero_trust/devices/devices.py | 3 +- .../resources/zero_trust/devices/dex_tests.py | 11 ++-- .../resources/zero_trust/devices/networks.py | 10 ++-- .../zero_trust/devices/override_codes.py | 2 +- .../devices/policies/default_policy.py | 2 +- .../zero_trust/devices/policies/excludes.py | 12 ++--- .../devices/policies/fallback_domains.py | 12 ++--- .../zero_trust/devices/policies/includes.py | 12 ++--- .../zero_trust/devices/policies/policies.py | 10 ++-- .../devices/posture/integrations.py | 4 +- .../zero_trust/devices/posture/posture.py | 8 +-- .../resources/zero_trust/devices/revoke.py | 3 +- .../resources/zero_trust/devices/settings.py | 3 +- .../resources/zero_trust/devices/unrevoke.py | 3 +- .../zero_trust/dex/fleet_status/devices.py | 3 +- .../dex/fleet_status/fleet_status.py | 3 +- .../zero_trust/dex/http_tests/http_tests.py | 3 +- .../zero_trust/dex/http_tests/percentiles.py | 3 +- .../resources/zero_trust/dex/tests/tests.py | 3 +- .../traceroute_test_results/network_path.py | 2 +- .../zero_trust/dex/traceroute_tests.py | 6 +-- .../zero_trust/dlp/datasets/datasets.py | 4 +- .../zero_trust/dlp/datasets/upload.py | 5 +- .../resources/zero_trust/dlp/patterns.py | 2 +- .../resources/zero_trust/dlp/payload_logs.py | 4 +- .../zero_trust/dlp/profiles/custom.py | 14 ++---- .../zero_trust/dlp/profiles/predefined.py | 5 +- .../zero_trust/dlp/profiles/profiles.py | 3 +- .../resources/zero_trust/gateway/app_types.py | 2 +- .../zero_trust/gateway/audit_ssh_settings.py | 3 +- .../zero_trust/gateway/categories.py | 2 +- .../zero_trust/gateway/configurations.py | 8 +-- .../resources/zero_trust/gateway/gateway.py | 3 +- .../zero_trust/gateway/lists/items.py | 2 +- .../zero_trust/gateway/lists/lists.py | 15 ++---- .../resources/zero_trust/gateway/locations.py | 12 ++--- .../resources/zero_trust/gateway/logging.py | 3 +- .../zero_trust/gateway/proxy_endpoints.py | 6 +-- .../resources/zero_trust/gateway/rules.py | 10 ++-- .../zero_trust/identity_providers.py | 11 ++-- .../zero_trust/networks/routes/ips.py | 2 +- .../zero_trust/networks/routes/networks.py | 2 +- .../zero_trust/networks/routes/routes.py | 4 +- .../zero_trust/networks/virtual_networks.py | 8 +-- .../resources/zero_trust/organizations.py | 6 +-- .../zero_trust/risk_scoring/behaviours.py | 4 +- .../zero_trust/risk_scoring/risk_scoring.py | 4 +- .../zero_trust/risk_scoring/summary.py | 3 +- src/cloudflare/resources/zero_trust/seats.py | 3 +- .../zero_trust/tunnels/configurations.py | 8 ++- .../zero_trust/tunnels/connections.py | 4 +- .../zero_trust/tunnels/connectors.py | 2 +- .../zero_trust/tunnels/management.py | 3 +- .../resources/zero_trust/tunnels/token.py | 2 +- .../resources/zero_trust/tunnels/tunnels.py | 17 +++---- .../resources/zones/activation_check.py | 2 +- .../resources/zones/custom_nameservers.py | 4 +- .../resources/zones/dns_settings.py | 4 +- src/cloudflare/resources/zones/holds.py | 3 +- .../resources/zones/settings/always_online.py | 3 +- .../automatic_platform_optimization.py | 8 ++- .../resources/zones/settings/brotli.py | 3 +- .../zones/settings/browser_cache_ttl.py | 3 +- .../resources/zones/settings/browser_check.py | 3 +- .../resources/zones/settings/cache_level.py | 3 +- .../resources/zones/settings/challenge_ttl.py | 3 +- .../zones/settings/development_mode.py | 3 +- .../zones/settings/email_obfuscation.py | 3 +- .../zones/settings/h2_prioritization.py | 4 +- .../zones/settings/hotlink_protection.py | 3 +- .../resources/zones/settings/http2.py | 3 +- .../resources/zones/settings/http3.py | 3 +- .../zones/settings/image_resizing.py | 4 +- .../zones/settings/ip_geolocation.py | 3 +- .../resources/zones/settings/ipv6.py | 3 +- .../zones/settings/min_tls_version.py | 3 +- .../resources/zones/settings/minify.py | 3 +- .../resources/zones/settings/mirage.py | 3 +- .../zones/settings/mobile_redirect.py | 3 +- .../resources/zones/settings/nel.py | 4 +- .../settings/opportunistic_encryption.py | 3 +- .../zones/settings/opportunistic_onion.py | 3 +- .../zones/settings/orange_to_orange.py | 4 +- .../settings/origin_error_page_pass_thru.py | 3 +- .../zones/settings/origin_max_http_version.py | 8 ++- .../resources/zones/settings/polish.py | 4 +- .../zones/settings/prefetch_preload.py | 3 +- .../zones/settings/proxy_read_timeout.py | 4 +- .../resources/zones/settings/pseudo_ipv4.py | 3 +- .../zones/settings/response_buffering.py | 3 +- .../resources/zones/settings/rocket_loader.py | 4 +- .../zones/settings/security_level.py | 3 +- .../settings/sort_query_string_for_cache.py | 3 +- .../resources/zones/settings/ssl.py | 3 +- .../zones/settings/ssl_recommender.py | 4 +- .../resources/zones/settings/tls_1_3.py | 3 +- .../zones/settings/tls_client_auth.py | 3 +- .../zones/settings/true_client_ip_header.py | 3 +- .../resources/zones/settings/waf.py | 3 +- .../resources/zones/settings/webp.py | 3 +- .../resources/zones/settings/websocket.py | 3 +- .../resources/zones/settings/zero_rtt.py | 3 +- .../resources/zones/subscriptions.py | 14 +++--- src/cloudflare/resources/zones/zones.py | 4 +- .../types/accounts/member_list_response.py | 2 +- .../types/accounts/user_with_invite_code.py | 2 +- .../prefixes/bgp/binding_delete_response.py | 2 +- .../custom_certificates/custom_certificate.py | 4 +- .../custom_certificate_create_params.py | 2 +- .../custom_certificate_edit_params.py | 2 +- .../types/firewall/firewall_rule.py | 4 +- .../firewall/waf/package_get_response.py | 2 +- .../firewall/waf/package_list_response.py | 2 +- .../types/images/v1_list_response.py | 2 +- .../types/intel/asn/subnet_get_response.py | 2 +- .../issue_list_response.py | 2 +- .../types/intel/dns_list_response.py | 2 +- .../keyless_certificate_create_params.py | 2 +- .../types/memberships/membership.py | 4 +- .../attacks/layer3/top_industry_response.py | 2 +- .../attacks/layer3/top_vertical_response.py | 2 +- .../attacks/layer7/top_industry_response.py | 2 +- .../attacks/layer7/top_vertical_response.py | 2 +- .../email/security/top/tld_get_response.py | 2 +- .../top/tlds/malicious_get_response.py | 2 +- .../security/top/tlds/spam_get_response.py | 2 +- .../security/top/tlds/spoof_get_response.py | 2 +- .../types/speed/test_list_response.py | 2 +- .../types/ssl/analyze_create_params.py | 2 +- .../subscription_create_params.py | 4 +- .../subscription_update_params.py | 4 +- .../types/url_scanner/scan_get_response.py | 2 +- .../types/url_scanner/scan_har_response.py | 2 +- src/cloudflare/types/user/invite.py | 2 +- src/cloudflare/types/user/organization.py | 2 +- .../types/user/token_create_response.py | 2 +- .../warp_connector_create_response.py | 2 +- .../warp_connector_delete_response.py | 2 +- .../warp_connector_edit_response.py | 2 +- .../warp_connector_get_response.py | 2 +- .../warp_connector_list_response.py | 2 +- src/cloudflare/types/workers/script.py | 2 +- .../types/workers/script_setting.py | 2 +- .../types/workers/script_update_params.py | 2 +- .../workers/scripts/tail_delete_response.py | 2 +- .../namespaces/script_update_params.py | 6 ++- .../scripts/binding_get_response.py | 2 +- .../scripts/content_update_params.py | 2 +- .../namespaces/scripts/setting_edit_params.py | 7 ++- .../scripts/setting_edit_response.py | 7 ++- .../scripts/setting_get_response.py | 7 ++- .../users/active_session_get_response.py | 2 +- .../types/zero_trust/access/users/identity.py | 2 +- .../zero_trust/devices/settings_policy.py | 4 +- .../types/zero_trust/dex/http_details.py | 2 +- .../zero_trust/dex/test_list_response.py | 4 +- .../types/zero_trust/dex/traceroute.py | 2 +- .../types/zero_trust/dlp/profile.py | 3 +- .../zero_trust/dlp/profile_get_response.py | 3 +- .../types/zero_trust/tunnel_edit_response.py | 2 +- .../types/zero_trust/tunnel_list_response.py | 2 +- .../types/zones/subscription_create_params.py | 4 +- tests/api_resources/accounts/test_members.py | 10 ++-- tests/api_resources/accounts/test_roles.py | 4 +- tests/api_resources/acm/test_total_tls.py | 3 +- .../addressing/address_maps/test_accounts.py | 6 +-- .../addressing/address_maps/test_ips.py | 6 +-- .../addressing/address_maps/test_zones.py | 6 +-- .../addressing/prefixes/bgp/test_bindings.py | 3 +- .../addressing/prefixes/bgp/test_prefixes.py | 2 +- .../addressing/prefixes/bgp/test_statuses.py | 3 +- .../addressing/prefixes/test_delegations.py | 6 +-- .../addressing/test_address_maps.py | 10 ++-- .../addressing/test_loa_documents.py | 2 +- .../api_resources/addressing/test_prefixes.py | 6 +-- .../api_resources/addressing/test_services.py | 2 +- .../alerting/destinations/test_eligible.py | 2 +- .../alerting/destinations/test_pagerduty.py | 10 ++-- .../alerting/destinations/test_webhooks.py | 10 ++-- .../alerting/test_available_alerts.py | 2 +- tests/api_resources/alerting/test_history.py | 2 +- tests/api_resources/alerting/test_policies.py | 10 ++-- .../api_resources/argo/test_smart_routing.py | 3 +- .../api_resources/argo/test_tiered_caching.py | 3 +- tests/api_resources/billing/test_profiles.py | 2 +- .../api_resources/cache/test_cache_reserve.py | 10 ++-- .../cache/test_regional_tiered_cache.py | 6 +-- .../cache/test_smart_tiered_cache.py | 8 ++- tests/api_resources/cache/test_variants.py | 8 ++- .../test_hostname_associations.py | 4 +- .../api_resources/challenges/test_widgets.py | 6 +-- .../cloudforce_one/requests/test_message.py | 8 ++- .../cloudforce_one/requests/test_priority.py | 9 ++-- .../cloudforce_one/test_requests.py | 14 +++--- .../custom_certificates/test_prioritize.py | 2 +- .../custom_hostnames/test_fallback_origin.py | 8 ++- tests/api_resources/d1/test_database.py | 12 ++--- .../api_resources/dcv_delegation/test_uuid.py | 2 +- .../diagnostics/test_traceroutes.py | 2 +- .../dns/analytics/reports/test_bytimes.py | 2 +- .../dns/analytics/test_reports.py | 2 +- .../analytics/reports/test_bytimes.py | 2 +- .../dns/firewall/analytics/test_reports.py | 2 +- tests/api_resources/dns/test_firewall.py | 6 +-- tests/api_resources/dns/test_records.py | 10 ++-- .../namespaces/test_objects.py | 2 +- .../durable_objects/test_namespaces.py | 2 +- .../email_routing/rules/test_catch_alls.py | 3 +- .../email_routing/test_addresses.py | 2 +- tests/api_resources/email_routing/test_dns.py | 2 +- .../api_resources/email_routing/test_rules.py | 2 +- .../r2/configuration/test_queues.py | 6 +-- .../r2/test_configuration.py | 2 +- .../firewall/test_access_rules.py | 10 ++-- .../api_resources/firewall/test_lockdowns.py | 6 +-- tests/api_resources/firewall/test_rules.py | 8 ++- tests/api_resources/firewall/test_ua_rules.py | 12 ++--- .../firewall/waf/packages/test_groups.py | 8 ++- .../firewall/waf/packages/test_rules.py | 8 ++- .../firewall/waf/test_overrides.py | 6 +-- .../firewall/waf/test_packages.py | 3 +- .../healthchecks/test_previews.py | 6 +-- .../hostnames/settings/test_tls.py | 8 ++- .../api_resources/hyperdrive/test_configs.py | 6 +-- tests/api_resources/images/test_v1.py | 8 ++- tests/api_resources/images/test_v2.py | 2 +- tests/api_resources/images/v1/test_keys.py | 4 +- tests/api_resources/images/v1/test_stats.py | 2 +- .../api_resources/images/v1/test_variants.py | 12 ++--- .../images/v2/test_direct_uploads.py | 2 +- tests/api_resources/intel/asn/test_subnets.py | 2 +- .../attack_surface_report/test_issue_types.py | 2 +- .../attack_surface_report/test_issues.py | 12 ++--- .../api_resources/intel/domains/test_bulks.py | 2 +- .../intel/indicator_feeds/test_permissions.py | 8 ++- tests/api_resources/intel/test_asn.py | 2 +- tests/api_resources/intel/test_dns.py | 2 +- .../intel/test_domain_history.py | 2 +- tests/api_resources/intel/test_domains.py | 2 +- .../intel/test_indicator_feeds.py | 10 ++-- tests/api_resources/intel/test_ip_lists.py | 2 +- tests/api_resources/intel/test_ips.py | 2 +- .../intel/test_miscategorizations.py | 2 +- tests/api_resources/intel/test_sinkholes.py | 2 +- tests/api_resources/intel/test_whois.py | 2 +- .../api_resources/kv/namespaces/test_bulk.py | 6 +-- .../api_resources/kv/namespaces/test_keys.py | 2 +- .../kv/namespaces/test_values.py | 6 +-- tests/api_resources/kv/test_namespaces.py | 8 ++- .../load_balancers/monitors/test_previews.py | 2 +- .../monitors/test_references.py | 2 +- .../load_balancers/pools/test_health.py | 3 +- .../load_balancers/pools/test_references.py | 2 +- .../load_balancers/test_monitors.py | 6 +-- .../load_balancers/test_pools.py | 6 +-- .../load_balancers/test_previews.py | 2 +- .../load_balancers/test_regions.py | 3 +- .../load_balancers/test_searches.py | 2 +- .../logpush/datasets/test_jobs.py | 2 +- tests/api_resources/logpush/test_edge.py | 3 +- tests/api_resources/logpush/test_jobs.py | 2 +- tests/api_resources/logpush/test_ownership.py | 6 +-- tests/api_resources/logpush/test_validate.py | 6 +-- .../logs/control/cmb/test_config.py | 2 +- .../logs/control/retention/test_flag.py | 3 +- .../logs/received/test_fields.py | 2 +- tests/api_resources/logs/test_rayid.py | 2 +- tests/api_resources/logs/test_received.py | 2 +- .../configs/test_full.py | 2 +- .../rules/test_advertisements.py | 2 +- .../magic_network_monitoring/test_configs.py | 4 +- .../magic_network_monitoring/test_rules.py | 4 +- .../magic_transit/sites/test_acls.py | 4 +- .../magic_transit/sites/test_lans.py | 6 +-- .../magic_transit/sites/test_wans.py | 6 +-- .../magic_transit/test_cf_interconnects.py | 8 ++- .../magic_transit/test_gre_tunnels.py | 12 ++--- .../magic_transit/test_ipsec_tunnels.py | 14 +++--- .../magic_transit/test_routes.py | 14 +++--- .../api_resources/magic_transit/test_sites.py | 4 +- .../mtls_certificates/test_associations.py | 2 +- .../hostnames/test_certificates.py | 10 ++-- .../origin_tls_client_auth/test_hostnames.py | 6 +-- .../origin_tls_client_auth/test_settings.py | 3 +- .../page_shield/test_connections.py | 2 +- .../page_shield/test_policies.py | 2 +- .../api_resources/page_shield/test_scripts.py | 3 +- .../api_resources/pagerules/test_settings.py | 2 +- .../projects/deployments/history/test_logs.py | 2 +- .../pages/projects/test_deployments.py | 2 +- .../pages/projects/test_domains.py | 8 ++- tests/api_resources/pages/test_projects.py | 11 ++-- tests/api_resources/pcaps/test_ownership.py | 3 +- tests/api_resources/queues/test_consumers.py | 10 ++-- tests/api_resources/queues/test_messages.py | 3 +- tests/api_resources/r2/test_buckets.py | 2 +- tests/api_resources/r2/test_sippy.py | 3 +- .../radar/annotations/test_outages.py | 6 +-- .../api_resources/radar/as112/test_summary.py | 14 +++--- .../radar/as112/test_timeseries_groups.py | 14 +++--- tests/api_resources/radar/as112/test_top.py | 10 ++-- .../radar/attacks/layer3/test_summary.py | 14 +++--- .../attacks/layer3/test_timeseries_groups.py | 18 +++---- .../radar/attacks/layer3/test_top.py | 8 ++- .../attacks/layer3/top/test_locations.py | 6 +-- .../radar/attacks/layer7/test_summary.py | 14 +++--- .../attacks/layer7/test_timeseries_groups.py | 16 ++++-- .../radar/attacks/layer7/test_top.py | 8 ++- .../radar/attacks/layer7/top/test_ases.py | 2 +- .../attacks/layer7/top/test_locations.py | 6 +-- .../radar/attacks/test_layer3.py | 2 +- .../radar/attacks/test_layer7.py | 2 +- .../radar/bgp/hijacks/test_events.py | 2 +- .../radar/bgp/leaks/test_events.py | 2 +- tests/api_resources/radar/bgp/test_routes.py | 10 ++-- tests/api_resources/radar/bgp/test_top.py | 2 +- .../api_resources/radar/bgp/top/test_ases.py | 3 +- tests/api_resources/radar/dns/test_top.py | 3 +- .../radar/email/routing/test_summary.py | 14 +++--- .../email/routing/test_timeseries_groups.py | 14 +++--- .../radar/email/security/test_summary.py | 20 ++++---- .../email/security/test_timeseries_groups.py | 18 ++++--- .../radar/email/security/top/test_tlds.py | 2 +- .../email/security/top/tlds/test_malicious.py | 2 +- .../email/security/top/tlds/test_spam.py | 2 +- .../email/security/top/tlds/test_spoof.py | 2 +- .../api_resources/radar/entities/test_asns.py | 10 ++-- .../radar/entities/test_locations.py | 6 +-- .../radar/http/ases/test_bot_class.py | 2 +- .../radar/http/ases/test_device_type.py | 2 +- .../radar/http/ases/test_http_method.py | 2 +- .../radar/http/ases/test_http_protocol.py | 2 +- .../radar/http/ases/test_ip_version.py | 2 +- .../api_resources/radar/http/ases/test_os.py | 2 +- .../radar/http/ases/test_tls_version.py | 2 +- .../radar/http/locations/test_bot_class.py | 2 +- .../radar/http/locations/test_device_type.py | 2 +- .../radar/http/locations/test_http_method.py | 2 +- .../http/locations/test_http_protocol.py | 2 +- .../radar/http/locations/test_ip_version.py | 2 +- .../radar/http/locations/test_os.py | 2 +- .../radar/http/locations/test_tls_version.py | 2 +- tests/api_resources/radar/http/test_ases.py | 2 +- .../radar/http/test_locations.py | 2 +- .../api_resources/radar/http/test_summary.py | 16 +++--- .../radar/http/test_timeseries_groups.py | 20 ++++---- tests/api_resources/radar/http/test_top.py | 6 +-- .../api_resources/radar/netflows/test_top.py | 3 +- .../radar/quality/speed/test_top.py | 6 +-- tests/api_resources/radar/quality/test_iqi.py | 6 +-- .../api_resources/radar/quality/test_speed.py | 6 +-- .../radar/ranking/test_domain.py | 2 +- tests/api_resources/radar/test_as112.py | 2 +- tests/api_resources/radar/test_bgp.py | 2 +- .../radar/test_connection_tampering.py | 4 +- tests/api_resources/radar/test_datasets.py | 6 +-- tests/api_resources/radar/test_entities.py | 2 +- tests/api_resources/radar/test_netflows.py | 2 +- tests/api_resources/radar/test_ranking.py | 6 +-- tests/api_resources/radar/test_search.py | 2 +- .../radar/test_traffic_anomalies.py | 2 +- .../radar/traffic_anomalies/test_locations.py | 2 +- .../radar/verified_bots/test_top.py | 6 +-- tests/api_resources/registrar/test_domains.py | 4 +- .../request_tracers/test_traces.py | 2 +- .../rules/lists/test_bulk_operations.py | 2 +- tests/api_resources/rules/lists/test_items.py | 10 ++-- tests/api_resources/rules/test_lists.py | 6 +-- .../rulesets/phases/test_versions.py | 4 +- tests/api_resources/rulesets/test_phases.py | 3 +- tests/api_resources/rulesets/test_rules.py | 8 ++- tests/api_resources/rulesets/test_versions.py | 3 +- .../rulesets/versions/test_by_tag.py | 2 +- tests/api_resources/rum/test_rules.py | 4 +- tests/api_resources/rum/test_site_info.py | 6 +-- .../api_resources/secondary_dns/test_acls.py | 6 +-- .../secondary_dns/test_incoming.py | 10 ++-- .../secondary_dns/test_outgoing.py | 10 ++-- .../api_resources/secondary_dns/test_peers.py | 6 +-- .../api_resources/secondary_dns/test_tsigs.py | 6 +-- tests/api_resources/snippets/test_rules.py | 3 +- .../analytics/aggregates/test_currents.py | 2 +- .../spectrum/analytics/events/test_bytimes.py | 2 +- .../analytics/events/test_summaries.py | 2 +- tests/api_resources/spectrum/test_apps.py | 10 ++-- .../speed/test_availabilities.py | 2 +- tests/api_resources/speed/test_pages.py | 2 +- tests/api_resources/speed/test_schedule.py | 2 +- tests/api_resources/speed/test_tests.py | 8 ++- .../ssl/certificate_packs/test_order.py | 2 +- .../ssl/certificate_packs/test_quota.py | 2 +- tests/api_resources/ssl/test_analyze.py | 2 +- .../ssl/test_certificate_packs.py | 8 ++- .../api_resources/ssl/test_recommendations.py | 2 +- tests/api_resources/ssl/test_verification.py | 6 +-- .../ssl/universal/test_settings.py | 2 +- tests/api_resources/storage/test_analytics.py | 3 +- .../stream/captions/test_language.py | 2 +- .../stream/live_inputs/test_outputs.py | 2 +- .../api_resources/stream/test_audio_tracks.py | 8 ++- tests/api_resources/stream/test_captions.py | 2 +- tests/api_resources/stream/test_clip.py | 2 +- tests/api_resources/stream/test_copy.py | 2 +- .../stream/test_direct_upload.py | 2 +- tests/api_resources/stream/test_downloads.py | 8 ++- tests/api_resources/stream/test_keys.py | 4 +- .../api_resources/stream/test_live_inputs.py | 6 +-- tests/api_resources/stream/test_token.py | 2 +- tests/api_resources/stream/test_videos.py | 2 +- tests/api_resources/stream/test_watermarks.py | 3 +- tests/api_resources/stream/test_webhooks.py | 8 ++- tests/api_resources/test_accounts.py | 6 +-- tests/api_resources/test_audit_logs.py | 2 +- tests/api_resources/test_bot_management.py | 6 +-- tests/api_resources/test_brand_protection.py | 6 +-- tests/api_resources/test_cache.py | 2 +- tests/api_resources/test_calls.py | 3 +- .../api_resources/test_client_certificates.py | 4 +- .../api_resources/test_custom_certificates.py | 12 ++--- tests/api_resources/test_custom_hostnames.py | 12 ++--- .../api_resources/test_custom_nameservers.py | 10 ++-- tests/api_resources/test_dnssec.py | 3 +- tests/api_resources/test_email_routing.py | 2 +- tests/api_resources/test_filters.py | 6 +-- tests/api_resources/test_healthchecks.py | 6 +-- tests/api_resources/test_ips.py | 2 +- .../test_keyless_certificates.py | 6 +-- tests/api_resources/test_load_balancers.py | 6 +-- tests/api_resources/test_managed_headers.py | 6 +-- tests/api_resources/test_memberships.py | 10 ++-- tests/api_resources/test_mtls_certificates.py | 6 +-- .../test_origin_ca_certificates.py | 8 +-- .../test_origin_post_quantum_encryption.py | 4 +- .../test_origin_tls_client_auth.py | 8 +-- tests/api_resources/test_page_shield.py | 3 +- tests/api_resources/test_pagerules.py | 14 +++--- tests/api_resources/test_pcaps.py | 4 +- tests/api_resources/test_plans.py | 2 +- tests/api_resources/test_queues.py | 10 ++-- tests/api_resources/test_rate_limits.py | 12 ++--- tests/api_resources/test_rate_plans.py | 2 +- tests/api_resources/test_rulesets.py | 10 ++-- tests/api_resources/test_snippets.py | 3 +- tests/api_resources/test_speed.py | 8 ++- tests/api_resources/test_stream.py | 2 +- tests/api_resources/test_subscriptions.py | 12 ++--- tests/api_resources/test_url_normalization.py | 6 +-- tests/api_resources/test_url_scanner.py | 2 +- tests/api_resources/test_user.py | 3 +- tests/api_resources/test_waiting_rooms.py | 6 +-- tests/api_resources/test_warp_connector.py | 14 +++--- tests/api_resources/test_zones.py | 3 +- tests/api_resources/url_scanner/test_scans.py | 8 ++- .../user/billing/test_history.py | 2 +- .../user/billing/test_profile.py | 2 +- tests/api_resources/user/test_audit_logs.py | 2 +- tests/api_resources/user/test_invites.py | 4 +- .../api_resources/user/test_organizations.py | 8 ++- .../api_resources/user/test_subscriptions.py | 10 ++-- tests/api_resources/user/test_tokens.py | 12 ++--- tests/api_resources/vectorize/test_indexes.py | 14 +++--- .../waiting_rooms/events/test_details.py | 2 +- .../waiting_rooms/test_events.py | 6 +-- .../api_resources/waiting_rooms/test_page.py | 2 +- .../api_resources/waiting_rooms/test_rules.py | 12 ++--- .../waiting_rooms/test_settings.py | 8 ++- .../waiting_rooms/test_statuses.py | 2 +- .../content_lists/test_entries.py | 12 ++--- .../test_content_lists.py | 2 +- tests/api_resources/web3/test_hostnames.py | 6 +-- .../workers/scripts/test_content.py | 2 +- .../workers/scripts/test_deployments.py | 6 +-- .../workers/scripts/test_schedules.py | 3 +- .../workers/scripts/test_settings.py | 2 +- .../workers/scripts/test_tail.py | 8 ++- .../workers/scripts/test_versions.py | 8 ++- .../workers/test_account_settings.py | 6 +-- tests/api_resources/workers/test_ai.py | 2 +- tests/api_resources/workers/test_domains.py | 2 +- tests/api_resources/workers/test_scripts.py | 2 +- .../api_resources/workers/test_subdomains.py | 3 +- .../namespaces/scripts/test_bindings.py | 2 +- .../namespaces/scripts/test_content.py | 2 +- .../namespaces/scripts/test_secrets.py | 4 +- .../namespaces/scripts/test_settings.py | 6 +-- .../dispatch/namespaces/scripts/test_tags.py | 6 +-- .../dispatch/namespaces/test_scripts.py | 50 +++++++++---------- .../dispatch/test_namespaces.py | 8 ++- .../access/applications/test_cas.py | 5 +- .../access/applications/test_policies.py | 6 +-- .../applications/test_user_policy_checks.py | 2 +- .../access/certificates/test_settings.py | 6 +-- .../access/logs/test_access_requests.py | 2 +- .../zero_trust/access/test_applications.py | 6 +-- .../zero_trust/access/test_bookmarks.py | 6 +-- .../zero_trust/access/test_certificates.py | 6 +-- .../zero_trust/access/test_custom_pages.py | 8 ++- .../zero_trust/access/test_groups.py | 6 +-- .../zero_trust/access/test_keys.py | 4 +- .../zero_trust/access/test_service_tokens.py | 8 ++- .../zero_trust/access/test_tags.py | 3 +- .../zero_trust/access/test_users.py | 2 +- .../access/users/test_active_sessions.py | 3 +- .../access/users/test_failed_logins.py | 2 +- .../access/users/test_last_seen_identity.py | 2 +- .../devices/policies/test_default_policy.py | 2 +- .../devices/policies/test_excludes.py | 8 ++- .../devices/policies/test_fallback_domains.py | 8 ++- .../devices/policies/test_includes.py | 8 ++- .../devices/posture/test_integrations.py | 6 +-- .../zero_trust/devices/test_dex_tests.py | 6 +-- .../zero_trust/devices/test_networks.py | 6 +-- .../zero_trust/devices/test_override_codes.py | 2 +- .../zero_trust/devices/test_policies.py | 6 +-- .../zero_trust/devices/test_posture.py | 6 +-- .../zero_trust/devices/test_revoke.py | 2 +- .../zero_trust/devices/test_settings.py | 2 +- .../zero_trust/devices/test_unrevoke.py | 2 +- .../dex/fleet_status/test_devices.py | 2 +- .../dex/http_tests/test_percentiles.py | 2 +- .../zero_trust/dex/test_fleet_status.py | 4 +- .../zero_trust/dex/test_http_tests.py | 2 +- .../zero_trust/dex/test_tests.py | 2 +- .../zero_trust/dex/test_traceroute_tests.py | 8 ++- .../dex/tests/test_unique_devices.py | 2 +- .../test_network_path.py | 2 +- .../zero_trust/dlp/datasets/test_upload.py | 4 +- .../zero_trust/dlp/profiles/test_custom.py | 8 ++- .../dlp/profiles/test_predefined.py | 2 +- .../zero_trust/dlp/test_datasets.py | 3 +- .../zero_trust/dlp/test_patterns.py | 2 +- .../zero_trust/dlp/test_payload_logs.py | 3 +- .../zero_trust/dlp/test_profiles.py | 3 +- .../zero_trust/gateway/lists/test_items.py | 2 +- .../zero_trust/gateway/test_app_types.py | 2 +- .../gateway/test_audit_ssh_settings.py | 2 +- .../zero_trust/gateway/test_categories.py | 2 +- .../zero_trust/gateway/test_configurations.py | 8 ++- .../zero_trust/gateway/test_lists.py | 8 ++- .../zero_trust/gateway/test_locations.py | 6 +-- .../zero_trust/gateway/test_logging.py | 2 +- .../gateway/test_proxy_endpoints.py | 6 +-- .../zero_trust/gateway/test_rules.py | 6 +-- .../zero_trust/networks/routes/test_ips.py | 2 +- .../networks/routes/test_networks.py | 2 +- .../zero_trust/networks/test_routes.py | 6 +-- .../networks/test_virtual_networks.py | 10 ++-- .../risk_scoring/test_behaviours.py | 6 +-- .../zero_trust/risk_scoring/test_summary.py | 2 +- .../zero_trust/test_connectivity_settings.py | 6 +-- .../api_resources/zero_trust/test_devices.py | 3 +- .../api_resources/zero_trust/test_gateway.py | 3 +- .../zero_trust/test_identity_providers.py | 8 ++- .../zero_trust/test_organizations.py | 6 +-- .../zero_trust/test_risk_scoring.py | 3 +- tests/api_resources/zero_trust/test_seats.py | 2 +- .../api_resources/zero_trust/test_tunnels.py | 12 ++--- .../zero_trust/tunnels/test_configurations.py | 6 +-- .../zero_trust/tunnels/test_connections.py | 6 +-- .../zero_trust/tunnels/test_connectors.py | 2 +- .../zero_trust/tunnels/test_management.py | 2 +- .../zero_trust/tunnels/test_token.py | 2 +- .../zones/settings/test_advanced_ddos.py | 2 +- .../zones/settings/test_always_online.py | 2 +- .../zones/settings/test_always_use_https.py | 2 +- .../settings/test_automatic_https_rewrites.py | 2 +- .../test_automatic_platform_optimization.py | 1 + .../zones/settings/test_brotli.py | 2 +- .../zones/settings/test_browser_cache_ttl.py | 2 +- .../zones/settings/test_browser_check.py | 2 +- .../zones/settings/test_cache_level.py | 2 +- .../zones/settings/test_challenge_ttl.py | 2 +- .../zones/settings/test_ciphers.py | 2 +- .../zones/settings/test_development_mode.py | 2 +- .../zones/settings/test_early_hints.py | 2 +- .../zones/settings/test_email_obfuscation.py | 2 +- .../zones/settings/test_font_settings.py | 2 +- .../zones/settings/test_h2_prioritization.py | 1 + .../zones/settings/test_hotlink_protection.py | 2 +- .../zones/settings/test_http2.py | 2 +- .../zones/settings/test_http3.py | 2 +- .../zones/settings/test_image_resizing.py | 1 + .../zones/settings/test_ip_geolocation.py | 2 +- .../api_resources/zones/settings/test_ipv6.py | 2 +- .../zones/settings/test_min_tls_version.py | 2 +- .../zones/settings/test_minify.py | 2 +- .../zones/settings/test_mirage.py | 2 +- .../zones/settings/test_mobile_redirect.py | 2 +- .../api_resources/zones/settings/test_nel.py | 1 + .../settings/test_opportunistic_encryption.py | 2 +- .../settings/test_opportunistic_onion.py | 2 +- .../zones/settings/test_orange_to_orange.py | 1 + .../test_origin_error_page_pass_thru.py | 2 +- .../settings/test_origin_max_http_version.py | 6 +-- .../zones/settings/test_polish.py | 1 + .../zones/settings/test_prefetch_preload.py | 2 +- .../zones/settings/test_proxy_read_timeout.py | 1 + .../zones/settings/test_pseudo_ipv4.py | 2 +- .../zones/settings/test_response_buffering.py | 2 +- .../zones/settings/test_rocket_loader.py | 1 + .../zones/settings/test_security_headers.py | 2 +- .../zones/settings/test_security_level.py | 2 +- .../settings/test_server_side_excludes.py | 2 +- .../test_sort_query_string_for_cache.py | 2 +- .../api_resources/zones/settings/test_ssl.py | 2 +- .../zones/settings/test_ssl_recommender.py | 1 + .../zones/settings/test_tls_1_3.py | 2 +- .../zones/settings/test_tls_client_auth.py | 2 +- .../settings/test_true_client_ip_header.py | 2 +- .../api_resources/zones/settings/test_waf.py | 2 +- .../api_resources/zones/settings/test_webp.py | 2 +- .../zones/settings/test_websocket.py | 2 +- .../zones/settings/test_zero_rtt.py | 2 +- .../zones/test_activation_check.py | 2 +- .../zones/test_custom_nameservers.py | 6 +-- .../api_resources/zones/test_dns_settings.py | 2 +- tests/api_resources/zones/test_holds.py | 2 +- .../api_resources/zones/test_subscriptions.py | 5 +- 963 files changed, 2418 insertions(+), 2740 deletions(-) diff --git a/src/cloudflare/_exceptions.py b/src/cloudflare/_exceptions.py index 5c2b9e5a263..e96c32acd1d 100644 --- a/src/cloudflare/_exceptions.py +++ b/src/cloudflare/_exceptions.py @@ -9,7 +9,7 @@ from ._utils import is_dict from ._models import construct_type -from .types.shared import ErrorData +from .types.shared.error_data import ErrorData __all__ = [ "BadRequestError", diff --git a/src/cloudflare/resources/accounts/accounts.py b/src/cloudflare/resources/accounts/accounts.py index efa5114b1a3..011e6fa6bdb 100644 --- a/src/cloudflare/resources/accounts/accounts.py +++ b/src/cloudflare/resources/accounts/accounts.py @@ -42,7 +42,9 @@ AsyncPaginator, make_request_options, ) -from ...types.accounts import AccountGetResponse, AccountUpdateResponse, account_list_params, account_update_params +from ...types.accounts import account_list_params, account_update_params +from ...types.accounts.account_get_response import AccountGetResponse +from ...types.accounts.account_update_response import AccountUpdateResponse __all__ = ["Accounts", "AsyncAccounts"] diff --git a/src/cloudflare/resources/accounts/members.py b/src/cloudflare/resources/accounts/members.py index 9324a2e3c33..78fdd5509b7 100644 --- a/src/cloudflare/resources/accounts/members.py +++ b/src/cloudflare/resources/accounts/members.py @@ -26,16 +26,11 @@ AsyncPaginator, make_request_options, ) -from ...types.shared import Member -from ...types.accounts import ( - MemberListResponse, - UserWithInviteCode, - MemberDeleteResponse, - member_list_params, - member_create_params, - member_delete_params, - member_update_params, -) +from ...types.accounts import member_list_params, member_create_params, member_delete_params, member_update_params +from ...types.shared.member import Member +from ...types.accounts.member_list_response import MemberListResponse +from ...types.accounts.user_with_invite_code import UserWithInviteCode +from ...types.accounts.member_delete_response import MemberDeleteResponse __all__ = ["Members", "AsyncMembers"] diff --git a/src/cloudflare/resources/accounts/roles.py b/src/cloudflare/resources/accounts/roles.py index 597e3523b1f..9452784e845 100644 --- a/src/cloudflare/resources/accounts/roles.py +++ b/src/cloudflare/resources/accounts/roles.py @@ -21,8 +21,8 @@ AsyncPaginator, make_request_options, ) -from ...types.shared import Role -from ...types.accounts import RoleGetResponse +from ...types.shared.role import Role +from ...types.accounts.role_get_response import RoleGetResponse __all__ = ["Roles", "AsyncRoles"] diff --git a/src/cloudflare/resources/acm/total_tls.py b/src/cloudflare/resources/acm/total_tls.py index 73110390c9a..bd4df5c4eec 100644 --- a/src/cloudflare/resources/acm/total_tls.py +++ b/src/cloudflare/resources/acm/total_tls.py @@ -21,10 +21,12 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.acm import TotalTLSGetResponse, TotalTLSCreateResponse, total_tls_create_params +from ...types.acm import total_tls_create_params from ..._base_client import ( make_request_options, ) +from ...types.acm.total_tls_get_response import TotalTLSGetResponse +from ...types.acm.total_tls_create_response import TotalTLSCreateResponse __all__ = ["TotalTLS", "AsyncTotalTLS"] diff --git a/src/cloudflare/resources/addressing/address_maps/accounts.py b/src/cloudflare/resources/addressing/address_maps/accounts.py index 7b7f606d93e..805fb92f899 100644 --- a/src/cloudflare/resources/addressing/address_maps/accounts.py +++ b/src/cloudflare/resources/addressing/address_maps/accounts.py @@ -23,12 +23,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.addressing.address_maps import ( - AccountDeleteResponse, - AccountUpdateResponse, - account_delete_params, - account_update_params, -) +from ....types.addressing.address_maps import account_delete_params, account_update_params +from ....types.addressing.address_maps.account_delete_response import AccountDeleteResponse +from ....types.addressing.address_maps.account_update_response import AccountUpdateResponse __all__ = ["Accounts", "AsyncAccounts"] diff --git a/src/cloudflare/resources/addressing/address_maps/address_maps.py b/src/cloudflare/resources/addressing/address_maps/address_maps.py index 741b864fe4e..d01b83cef3c 100644 --- a/src/cloudflare/resources/addressing/address_maps/address_maps.py +++ b/src/cloudflare/resources/addressing/address_maps/address_maps.py @@ -49,15 +49,11 @@ AsyncPaginator, make_request_options, ) -from ....types.addressing import ( - AddressMap, - AddressMapGetResponse, - AddressMapCreateResponse, - AddressMapDeleteResponse, - address_map_edit_params, - address_map_create_params, - address_map_delete_params, -) +from ....types.addressing import address_map_edit_params, address_map_create_params, address_map_delete_params +from ....types.addressing.address_map import AddressMap +from ....types.addressing.address_map_get_response import AddressMapGetResponse +from ....types.addressing.address_map_create_response import AddressMapCreateResponse +from ....types.addressing.address_map_delete_response import AddressMapDeleteResponse __all__ = ["AddressMaps", "AsyncAddressMaps"] diff --git a/src/cloudflare/resources/addressing/address_maps/ips.py b/src/cloudflare/resources/addressing/address_maps/ips.py index 7fce9de32f4..45f608af3fd 100644 --- a/src/cloudflare/resources/addressing/address_maps/ips.py +++ b/src/cloudflare/resources/addressing/address_maps/ips.py @@ -23,7 +23,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.addressing.address_maps import IPDeleteResponse, IPUpdateResponse, ip_delete_params, ip_update_params +from ....types.addressing.address_maps import ip_delete_params, ip_update_params +from ....types.addressing.address_maps.ip_delete_response import IPDeleteResponse +from ....types.addressing.address_maps.ip_update_response import IPUpdateResponse __all__ = ["IPs", "AsyncIPs"] diff --git a/src/cloudflare/resources/addressing/address_maps/zones.py b/src/cloudflare/resources/addressing/address_maps/zones.py index 6bc6ebd0ed6..20bb7b90f40 100644 --- a/src/cloudflare/resources/addressing/address_maps/zones.py +++ b/src/cloudflare/resources/addressing/address_maps/zones.py @@ -23,12 +23,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.addressing.address_maps import ( - ZoneDeleteResponse, - ZoneUpdateResponse, - zone_delete_params, - zone_update_params, -) +from ....types.addressing.address_maps import zone_delete_params, zone_update_params +from ....types.addressing.address_maps.zone_delete_response import ZoneDeleteResponse +from ....types.addressing.address_maps.zone_update_response import ZoneUpdateResponse __all__ = ["Zones", "AsyncZones"] diff --git a/src/cloudflare/resources/addressing/loa_documents/loa_documents.py b/src/cloudflare/resources/addressing/loa_documents/loa_documents.py index 665dcd1afd5..9c9a28d9266 100644 --- a/src/cloudflare/resources/addressing/loa_documents/loa_documents.py +++ b/src/cloudflare/resources/addressing/loa_documents/loa_documents.py @@ -31,7 +31,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.addressing import LOADocumentCreateResponse, loa_document_create_params +from ....types.addressing import loa_document_create_params +from ....types.addressing.loa_document_create_response import LOADocumentCreateResponse __all__ = ["LOADocuments", "AsyncLOADocuments"] diff --git a/src/cloudflare/resources/addressing/prefixes/bgp/bindings.py b/src/cloudflare/resources/addressing/prefixes/bgp/bindings.py index 69dcda37ac0..57b7074c31b 100644 --- a/src/cloudflare/resources/addressing/prefixes/bgp/bindings.py +++ b/src/cloudflare/resources/addressing/prefixes/bgp/bindings.py @@ -25,7 +25,9 @@ AsyncPaginator, make_request_options, ) -from .....types.addressing.prefixes.bgp import ServiceBinding, BindingDeleteResponse, binding_create_params +from .....types.addressing.prefixes.bgp import binding_create_params +from .....types.addressing.prefixes.bgp.service_binding import ServiceBinding +from .....types.addressing.prefixes.bgp.binding_delete_response import BindingDeleteResponse __all__ = ["Bindings", "AsyncBindings"] diff --git a/src/cloudflare/resources/addressing/prefixes/bgp/prefixes.py b/src/cloudflare/resources/addressing/prefixes/bgp/prefixes.py index 98570b31be6..8615ab4cfce 100644 --- a/src/cloudflare/resources/addressing/prefixes/bgp/prefixes.py +++ b/src/cloudflare/resources/addressing/prefixes/bgp/prefixes.py @@ -25,7 +25,8 @@ AsyncPaginator, make_request_options, ) -from .....types.addressing.prefixes.bgp import BGPPrefix, prefix_edit_params +from .....types.addressing.prefixes.bgp import prefix_edit_params +from .....types.addressing.prefixes.bgp.bgp_prefix import BGPPrefix __all__ = ["Prefixes", "AsyncPrefixes"] diff --git a/src/cloudflare/resources/addressing/prefixes/bgp/statuses.py b/src/cloudflare/resources/addressing/prefixes/bgp/statuses.py index daf1bc5d23a..d580df2f18f 100644 --- a/src/cloudflare/resources/addressing/prefixes/bgp/statuses.py +++ b/src/cloudflare/resources/addressing/prefixes/bgp/statuses.py @@ -23,7 +23,9 @@ from ....._base_client import ( make_request_options, ) -from .....types.addressing.prefixes.bgp import StatusGetResponse, StatusEditResponse, status_edit_params +from .....types.addressing.prefixes.bgp import status_edit_params +from .....types.addressing.prefixes.bgp.status_get_response import StatusGetResponse +from .....types.addressing.prefixes.bgp.status_edit_response import StatusEditResponse __all__ = ["Statuses", "AsyncStatuses"] diff --git a/src/cloudflare/resources/addressing/prefixes/delegations.py b/src/cloudflare/resources/addressing/prefixes/delegations.py index dba2371c2af..b35bd3b27a1 100644 --- a/src/cloudflare/resources/addressing/prefixes/delegations.py +++ b/src/cloudflare/resources/addressing/prefixes/delegations.py @@ -25,12 +25,8 @@ AsyncPaginator, make_request_options, ) -from ....types.addressing.prefixes import ( - DelegationDeleteResponse, - delegations, - delegation_create_params, - delegation_delete_params, -) +from ....types.addressing.prefixes import delegations, delegation_create_params, delegation_delete_params +from ....types.addressing.prefixes.delegation_delete_response import DelegationDeleteResponse __all__ = ["Delegations", "AsyncDelegations"] diff --git a/src/cloudflare/resources/addressing/prefixes/prefixes.py b/src/cloudflare/resources/addressing/prefixes/prefixes.py index 8b1c16448b6..060be1ef0b4 100644 --- a/src/cloudflare/resources/addressing/prefixes/prefixes.py +++ b/src/cloudflare/resources/addressing/prefixes/prefixes.py @@ -42,13 +42,9 @@ AsyncPaginator, make_request_options, ) -from ....types.addressing import ( - Prefix, - PrefixDeleteResponse, - prefix_edit_params, - prefix_create_params, - prefix_delete_params, -) +from ....types.addressing import prefix_edit_params, prefix_create_params, prefix_delete_params +from ....types.addressing.prefix import Prefix +from ....types.addressing.prefix_delete_response import PrefixDeleteResponse __all__ = ["Prefixes", "AsyncPrefixes"] diff --git a/src/cloudflare/resources/addressing/services.py b/src/cloudflare/resources/addressing/services.py index 13a93ebb865..e50221ea01e 100644 --- a/src/cloudflare/resources/addressing/services.py +++ b/src/cloudflare/resources/addressing/services.py @@ -18,7 +18,7 @@ AsyncPaginator, make_request_options, ) -from ...types.addressing import ServiceListResponse +from ...types.addressing.service_list_response import ServiceListResponse __all__ = ["Services", "AsyncServices"] diff --git a/src/cloudflare/resources/alerting/available_alerts.py b/src/cloudflare/resources/alerting/available_alerts.py index 46b87e0dee0..874017aaaf3 100644 --- a/src/cloudflare/resources/alerting/available_alerts.py +++ b/src/cloudflare/resources/alerting/available_alerts.py @@ -19,7 +19,7 @@ from ..._base_client import ( make_request_options, ) -from ...types.alerting import AvailableAlertListResponse +from ...types.alerting.available_alert_list_response import AvailableAlertListResponse __all__ = ["AvailableAlerts", "AsyncAvailableAlerts"] diff --git a/src/cloudflare/resources/alerting/destinations/eligible.py b/src/cloudflare/resources/alerting/destinations/eligible.py index 32639332e25..23790ef18c9 100644 --- a/src/cloudflare/resources/alerting/destinations/eligible.py +++ b/src/cloudflare/resources/alerting/destinations/eligible.py @@ -19,7 +19,7 @@ from ...._base_client import ( make_request_options, ) -from ....types.alerting.destinations import EligibleGetResponse +from ....types.alerting.destinations.eligible_get_response import EligibleGetResponse __all__ = ["Eligible", "AsyncEligible"] diff --git a/src/cloudflare/resources/alerting/destinations/pagerduty.py b/src/cloudflare/resources/alerting/destinations/pagerduty.py index d6c81c9de5a..bf465aff2f2 100644 --- a/src/cloudflare/resources/alerting/destinations/pagerduty.py +++ b/src/cloudflare/resources/alerting/destinations/pagerduty.py @@ -19,12 +19,10 @@ from ...._base_client import ( make_request_options, ) -from ....types.alerting.destinations import ( - PagerdutyGetResponse, - PagerdutyLinkResponse, - PagerdutyCreateResponse, - PagerdutyDeleteResponse, -) +from ....types.alerting.destinations.pagerduty_get_response import PagerdutyGetResponse +from ....types.alerting.destinations.pagerduty_link_response import PagerdutyLinkResponse +from ....types.alerting.destinations.pagerduty_create_response import PagerdutyCreateResponse +from ....types.alerting.destinations.pagerduty_delete_response import PagerdutyDeleteResponse __all__ = ["PagerdutyResource", "AsyncPagerdutyResource"] diff --git a/src/cloudflare/resources/alerting/destinations/webhooks.py b/src/cloudflare/resources/alerting/destinations/webhooks.py index 222d8205427..14f8f2ce3bd 100644 --- a/src/cloudflare/resources/alerting/destinations/webhooks.py +++ b/src/cloudflare/resources/alerting/destinations/webhooks.py @@ -25,14 +25,10 @@ AsyncPaginator, make_request_options, ) -from ....types.alerting.destinations import ( - WebhookCreateResponse, - WebhookDeleteResponse, - WebhookUpdateResponse, - webhooks, - webhook_create_params, - webhook_update_params, -) +from ....types.alerting.destinations import webhooks, webhook_create_params, webhook_update_params +from ....types.alerting.destinations.webhook_create_response import WebhookCreateResponse +from ....types.alerting.destinations.webhook_delete_response import WebhookDeleteResponse +from ....types.alerting.destinations.webhook_update_response import WebhookUpdateResponse __all__ = ["Webhooks", "AsyncWebhooks"] diff --git a/src/cloudflare/resources/alerting/history.py b/src/cloudflare/resources/alerting/history.py index aa17818d0eb..9ddd67eb387 100644 --- a/src/cloudflare/resources/alerting/history.py +++ b/src/cloudflare/resources/alerting/history.py @@ -22,7 +22,8 @@ AsyncPaginator, make_request_options, ) -from ...types.alerting import History, history_list_params +from ...types.alerting import history_list_params +from ...types.alerting.history import History __all__ = ["HistoryResource", "AsyncHistoryResource"] diff --git a/src/cloudflare/resources/alerting/policies.py b/src/cloudflare/resources/alerting/policies.py index 540adface1a..01db0e0f4f0 100644 --- a/src/cloudflare/resources/alerting/policies.py +++ b/src/cloudflare/resources/alerting/policies.py @@ -26,16 +26,13 @@ AsyncPaginator, make_request_options, ) -from ...types.alerting import ( - Policy, - MechanismParam, - PolicyFilterParam, - PolicyCreateResponse, - PolicyDeleteResponse, - PolicyUpdateResponse, - policy_create_params, - policy_update_params, -) +from ...types.alerting import policy_create_params, policy_update_params +from ...types.alerting.policy import Policy +from ...types.alerting.mechanism_param import MechanismParam +from ...types.alerting.policy_filter_param import PolicyFilterParam +from ...types.alerting.policy_create_response import PolicyCreateResponse +from ...types.alerting.policy_delete_response import PolicyDeleteResponse +from ...types.alerting.policy_update_response import PolicyUpdateResponse __all__ = ["Policies", "AsyncPolicies"] diff --git a/src/cloudflare/resources/argo/smart_routing.py b/src/cloudflare/resources/argo/smart_routing.py index 7fe6dea119b..a13a68fc48c 100644 --- a/src/cloudflare/resources/argo/smart_routing.py +++ b/src/cloudflare/resources/argo/smart_routing.py @@ -21,10 +21,12 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.argo import SmartRoutingGetResponse, SmartRoutingEditResponse, smart_routing_edit_params +from ...types.argo import smart_routing_edit_params from ..._base_client import ( make_request_options, ) +from ...types.argo.smart_routing_get_response import SmartRoutingGetResponse +from ...types.argo.smart_routing_edit_response import SmartRoutingEditResponse __all__ = ["SmartRouting", "AsyncSmartRouting"] diff --git a/src/cloudflare/resources/argo/tiered_caching.py b/src/cloudflare/resources/argo/tiered_caching.py index 4d64d798e1f..3f61e93a106 100644 --- a/src/cloudflare/resources/argo/tiered_caching.py +++ b/src/cloudflare/resources/argo/tiered_caching.py @@ -21,10 +21,12 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.argo import TieredCachingGetResponse, TieredCachingEditResponse, tiered_caching_edit_params +from ...types.argo import tiered_caching_edit_params from ..._base_client import ( make_request_options, ) +from ...types.argo.tiered_caching_get_response import TieredCachingGetResponse +from ...types.argo.tiered_caching_edit_response import TieredCachingEditResponse __all__ = ["TieredCaching", "AsyncTieredCaching"] diff --git a/src/cloudflare/resources/audit_logs.py b/src/cloudflare/resources/audit_logs.py index 5cfd91749b5..85d8a670ff5 100644 --- a/src/cloudflare/resources/audit_logs.py +++ b/src/cloudflare/resources/audit_logs.py @@ -23,8 +23,8 @@ AsyncPaginator, make_request_options, ) -from ..types.shared import AuditLog from ..types.audit_logs import audit_log_list_params +from ..types.shared.audit_log import AuditLog __all__ = ["AuditLogs", "AsyncAuditLogs"] diff --git a/src/cloudflare/resources/billing/profiles.py b/src/cloudflare/resources/billing/profiles.py index 7632930e29d..33890e895b4 100644 --- a/src/cloudflare/resources/billing/profiles.py +++ b/src/cloudflare/resources/billing/profiles.py @@ -19,7 +19,7 @@ from ..._base_client import ( make_request_options, ) -from ...types.billing import ProfileGetResponse +from ...types.billing.profile_get_response import ProfileGetResponse __all__ = ["Profiles", "AsyncProfiles"] diff --git a/src/cloudflare/resources/bot_management.py b/src/cloudflare/resources/bot_management.py index bbfb787edf5..2466e3d53a9 100644 --- a/src/cloudflare/resources/bot_management.py +++ b/src/cloudflare/resources/bot_management.py @@ -25,7 +25,9 @@ from .._base_client import ( make_request_options, ) -from ..types.bot_management import BotManagementGetResponse, BotManagementUpdateResponse, bot_management_update_params +from ..types.bot_management import bot_management_update_params +from ..types.bot_management.bot_management_get_response import BotManagementGetResponse +from ..types.bot_management.bot_management_update_response import BotManagementUpdateResponse __all__ = ["BotManagement", "AsyncBotManagement"] diff --git a/src/cloudflare/resources/brand_protection.py b/src/cloudflare/resources/brand_protection.py index f4c6c920e1c..b587a9d45fb 100644 --- a/src/cloudflare/resources/brand_protection.py +++ b/src/cloudflare/resources/brand_protection.py @@ -23,7 +23,9 @@ from .._base_client import ( make_request_options, ) -from ..types.brand_protection import Info, Submit, brand_protection_submit_params, brand_protection_url_info_params +from ..types.brand_protection import brand_protection_submit_params, brand_protection_url_info_params +from ..types.brand_protection.info import Info +from ..types.brand_protection.submit import Submit __all__ = ["BrandProtection", "AsyncBrandProtection"] diff --git a/src/cloudflare/resources/cache/cache.py b/src/cloudflare/resources/cache/cache.py index 1d5cdd1288e..8888931e5bd 100644 --- a/src/cloudflare/resources/cache/cache.py +++ b/src/cloudflare/resources/cache/cache.py @@ -29,7 +29,7 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.cache import CachePurgeResponse, cache_purge_params +from ...types.cache import cache_purge_params from .cache_reserve import ( CacheReserveResource, AsyncCacheReserveResource, @@ -57,6 +57,7 @@ RegionalTieredCacheResourceWithStreamingResponse, AsyncRegionalTieredCacheResourceWithStreamingResponse, ) +from ...types.cache.cache_purge_response import CachePurgeResponse __all__ = ["Cache", "AsyncCache"] diff --git a/src/cloudflare/resources/cache/cache_reserve.py b/src/cloudflare/resources/cache/cache_reserve.py index f483fc22532..8a249b50a0a 100644 --- a/src/cloudflare/resources/cache/cache_reserve.py +++ b/src/cloudflare/resources/cache/cache_reserve.py @@ -21,17 +21,14 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.cache import ( - CacheReserveGetResponse, - CacheReserveEditResponse, - CacheReserveClearResponse, - CacheReserveStatusResponse, - cache_reserve_edit_params, - cache_reserve_clear_params, -) +from ...types.cache import cache_reserve_edit_params, cache_reserve_clear_params from ..._base_client import ( make_request_options, ) +from ...types.cache.cache_reserve_get_response import CacheReserveGetResponse +from ...types.cache.cache_reserve_edit_response import CacheReserveEditResponse +from ...types.cache.cache_reserve_clear_response import CacheReserveClearResponse +from ...types.cache.cache_reserve_status_response import CacheReserveStatusResponse __all__ = ["CacheReserveResource", "AsyncCacheReserveResource"] diff --git a/src/cloudflare/resources/cache/regional_tiered_cache.py b/src/cloudflare/resources/cache/regional_tiered_cache.py index f12b71eecd8..4ccfd7c49cc 100644 --- a/src/cloudflare/resources/cache/regional_tiered_cache.py +++ b/src/cloudflare/resources/cache/regional_tiered_cache.py @@ -21,14 +21,12 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.cache import ( - RegionalTieredCacheGetResponse, - RegionalTieredCacheEditResponse, - regional_tiered_cache_edit_params, -) +from ...types.cache import regional_tiered_cache_edit_params from ..._base_client import ( make_request_options, ) +from ...types.cache.regional_tiered_cache_get_response import RegionalTieredCacheGetResponse +from ...types.cache.regional_tiered_cache_edit_response import RegionalTieredCacheEditResponse __all__ = ["RegionalTieredCacheResource", "AsyncRegionalTieredCacheResource"] diff --git a/src/cloudflare/resources/cache/smart_tiered_cache.py b/src/cloudflare/resources/cache/smart_tiered_cache.py index 303ed285a03..18aca3fe8ad 100644 --- a/src/cloudflare/resources/cache/smart_tiered_cache.py +++ b/src/cloudflare/resources/cache/smart_tiered_cache.py @@ -21,16 +21,13 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.cache import ( - SmartTieredCacheGetResponse, - SmartTieredCacheEditResponse, - SmartTieredCacheDeleteResponse, - smart_tiered_cache_edit_params, - smart_tiered_cache_delete_params, -) +from ...types.cache import smart_tiered_cache_edit_params, smart_tiered_cache_delete_params from ..._base_client import ( make_request_options, ) +from ...types.cache.smart_tiered_cache_get_response import SmartTieredCacheGetResponse +from ...types.cache.smart_tiered_cache_edit_response import SmartTieredCacheEditResponse +from ...types.cache.smart_tiered_cache_delete_response import SmartTieredCacheDeleteResponse __all__ = ["SmartTieredCache", "AsyncSmartTieredCache"] diff --git a/src/cloudflare/resources/cache/variants.py b/src/cloudflare/resources/cache/variants.py index 2a4d6d88904..872f9d09ff4 100644 --- a/src/cloudflare/resources/cache/variants.py +++ b/src/cloudflare/resources/cache/variants.py @@ -20,16 +20,13 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.cache import ( - CacheVariant, - VariantGetResponse, - VariantEditResponse, - variant_edit_params, - variant_delete_params, -) +from ...types.cache import variant_edit_params, variant_delete_params from ..._base_client import ( make_request_options, ) +from ...types.cache.cache_variant import CacheVariant +from ...types.cache.variant_get_response import VariantGetResponse +from ...types.cache.variant_edit_response import VariantEditResponse __all__ = ["Variants", "AsyncVariants"] diff --git a/src/cloudflare/resources/calls.py b/src/cloudflare/resources/calls.py index 08c1435c146..91af83fbc4f 100644 --- a/src/cloudflare/resources/calls.py +++ b/src/cloudflare/resources/calls.py @@ -21,11 +21,13 @@ ) from .._wrappers import ResultWrapper from ..pagination import SyncSinglePage, AsyncSinglePage -from ..types.calls import CallsApp, CallsAppWithSecret, call_create_params, call_update_params +from ..types.calls import call_create_params, call_update_params from .._base_client import ( AsyncPaginator, make_request_options, ) +from ..types.calls.calls_app import CallsApp +from ..types.calls.calls_app_with_secret import CallsAppWithSecret __all__ = ["Calls", "AsyncCalls"] diff --git a/src/cloudflare/resources/certificate_authorities/hostname_associations.py b/src/cloudflare/resources/certificate_authorities/hostname_associations.py index f7c37d655f6..b0ed93f66ee 100644 --- a/src/cloudflare/resources/certificate_authorities/hostname_associations.py +++ b/src/cloudflare/resources/certificate_authorities/hostname_associations.py @@ -23,13 +23,10 @@ from ..._base_client import ( make_request_options, ) -from ...types.certificate_authorities import ( - HostnameAssociation, - HostnameAssociationGetResponse, - HostnameAssociationUpdateResponse, - hostname_association_get_params, - hostname_association_update_params, -) +from ...types.certificate_authorities import hostname_association_get_params, hostname_association_update_params +from ...types.certificate_authorities.hostname_association import HostnameAssociation +from ...types.certificate_authorities.hostname_association_get_response import HostnameAssociationGetResponse +from ...types.certificate_authorities.hostname_association_update_response import HostnameAssociationUpdateResponse __all__ = ["HostnameAssociations", "AsyncHostnameAssociations"] diff --git a/src/cloudflare/resources/challenges/widgets.py b/src/cloudflare/resources/challenges/widgets.py index d5424192156..9d8bc4e708a 100644 --- a/src/cloudflare/resources/challenges/widgets.py +++ b/src/cloudflare/resources/challenges/widgets.py @@ -27,14 +27,14 @@ make_request_options, ) from ...types.challenges import ( - Widget, - WidgetDomain, - WidgetListResponse, widget_list_params, widget_create_params, widget_update_params, widget_rotate_secret_params, ) +from ...types.challenges.widget import Widget +from ...types.challenges.widget_domain import WidgetDomain +from ...types.challenges.widget_list_response import WidgetListResponse __all__ = ["Widgets", "AsyncWidgets"] diff --git a/src/cloudflare/resources/client_certificates.py b/src/cloudflare/resources/client_certificates.py index 305850590cb..1bdf58707d1 100644 --- a/src/cloudflare/resources/client_certificates.py +++ b/src/cloudflare/resources/client_certificates.py @@ -26,11 +26,8 @@ AsyncPaginator, make_request_options, ) -from ..types.client_certificates import ( - ClientCertificate, - client_certificate_list_params, - client_certificate_create_params, -) +from ..types.client_certificates import client_certificate_list_params, client_certificate_create_params +from ..types.client_certificates.client_certificate import ClientCertificate __all__ = ["ClientCertificates", "AsyncClientCertificates"] diff --git a/src/cloudflare/resources/cloudforce_one/requests/message.py b/src/cloudflare/resources/cloudforce_one/requests/message.py index b13d042cd93..eaea1a987b6 100644 --- a/src/cloudflare/resources/cloudforce_one/requests/message.py +++ b/src/cloudflare/resources/cloudforce_one/requests/message.py @@ -25,14 +25,10 @@ from ...._base_client import ( make_request_options, ) -from ....types.cloudforce_one.requests import ( - Message, - MessageGetResponse, - MessageDeleteResponse, - message_get_params, - message_create_params, - message_update_params, -) +from ....types.cloudforce_one.requests import message_get_params, message_create_params, message_update_params +from ....types.cloudforce_one.requests.message import Message +from ....types.cloudforce_one.requests.message_get_response import MessageGetResponse +from ....types.cloudforce_one.requests.message_delete_response import MessageDeleteResponse __all__ = ["MessageResource", "AsyncMessageResource"] diff --git a/src/cloudflare/resources/cloudforce_one/requests/priority.py b/src/cloudflare/resources/cloudforce_one/requests/priority.py index 8047613a8f6..0f1d6795a40 100644 --- a/src/cloudflare/resources/cloudforce_one/requests/priority.py +++ b/src/cloudflare/resources/cloudforce_one/requests/priority.py @@ -24,14 +24,12 @@ from ...._base_client import ( make_request_options, ) -from ....types.cloudforce_one import Item, Quota -from ....types.cloudforce_one.requests import ( - Label, - Priority, - PriorityDeleteResponse, - priority_create_params, - priority_update_params, -) +from ....types.cloudforce_one.item import Item +from ....types.cloudforce_one.quota import Quota +from ....types.cloudforce_one.requests import priority_create_params, priority_update_params +from ....types.cloudforce_one.requests.label import Label +from ....types.cloudforce_one.requests.priority import Priority +from ....types.cloudforce_one.requests.priority_delete_response import PriorityDeleteResponse __all__ = ["PriorityResource", "AsyncPriorityResource"] diff --git a/src/cloudflare/resources/cloudforce_one/requests/requests.py b/src/cloudflare/resources/cloudforce_one/requests/requests.py index c05e3656a92..c53897c8e81 100644 --- a/src/cloudflare/resources/cloudforce_one/requests/requests.py +++ b/src/cloudflare/resources/cloudforce_one/requests/requests.py @@ -43,17 +43,13 @@ AsyncPaginator, make_request_options, ) -from ....types.cloudforce_one import ( - Item, - Quota, - ListItem, - RequestTypes, - RequestConstants, - RequestDeleteResponse, - request_list_params, - request_create_params, - request_update_params, -) +from ....types.cloudforce_one import request_list_params, request_create_params, request_update_params +from ....types.cloudforce_one.item import Item +from ....types.cloudforce_one.quota import Quota +from ....types.cloudforce_one.list_item import ListItem +from ....types.cloudforce_one.request_types import RequestTypes +from ....types.cloudforce_one.request_constants import RequestConstants +from ....types.cloudforce_one.request_delete_response import RequestDeleteResponse __all__ = ["Requests", "AsyncRequests"] diff --git a/src/cloudflare/resources/custom_certificates/custom_certificates.py b/src/cloudflare/resources/custom_certificates/custom_certificates.py index 2864d68ed1e..4e5e4ba8dc6 100644 --- a/src/cloudflare/resources/custom_certificates/custom_certificates.py +++ b/src/cloudflare/resources/custom_certificates/custom_certificates.py @@ -36,17 +36,18 @@ ) from ...types.custom_hostnames import BundleMethod from ...types.custom_certificates import ( - CustomCertificate, - GeoRestrictionsParam, - CustomCertificateGetResponse, - CustomCertificateEditResponse, - CustomCertificateCreateResponse, - CustomCertificateDeleteResponse, custom_certificate_edit_params, custom_certificate_list_params, custom_certificate_create_params, custom_certificate_delete_params, ) +from ...types.custom_hostnames.bundle_method import BundleMethod +from ...types.custom_certificates.custom_certificate import CustomCertificate +from ...types.custom_certificates.geo_restrictions_param import GeoRestrictionsParam +from ...types.custom_certificates.custom_certificate_get_response import CustomCertificateGetResponse +from ...types.custom_certificates.custom_certificate_edit_response import CustomCertificateEditResponse +from ...types.custom_certificates.custom_certificate_create_response import CustomCertificateCreateResponse +from ...types.custom_certificates.custom_certificate_delete_response import CustomCertificateDeleteResponse __all__ = ["CustomCertificates", "AsyncCustomCertificates"] diff --git a/src/cloudflare/resources/custom_certificates/prioritize.py b/src/cloudflare/resources/custom_certificates/prioritize.py index 1ffb0a4b1af..038920ac757 100644 --- a/src/cloudflare/resources/custom_certificates/prioritize.py +++ b/src/cloudflare/resources/custom_certificates/prioritize.py @@ -23,7 +23,8 @@ from ..._base_client import ( make_request_options, ) -from ...types.custom_certificates import PrioritizeUpdateResponse, prioritize_update_params +from ...types.custom_certificates import prioritize_update_params +from ...types.custom_certificates.prioritize_update_response import PrioritizeUpdateResponse __all__ = ["Prioritize", "AsyncPrioritize"] diff --git a/src/cloudflare/resources/custom_hostnames/custom_hostnames.py b/src/cloudflare/resources/custom_hostnames/custom_hostnames.py index 841f970b781..1d0390b4ed6 100644 --- a/src/cloudflare/resources/custom_hostnames/custom_hostnames.py +++ b/src/cloudflare/resources/custom_hostnames/custom_hostnames.py @@ -35,16 +35,16 @@ AsyncFallbackOriginWithStreamingResponse, ) from ...types.custom_hostnames import ( - CustomHostnameGetResponse, - CustomHostnameEditResponse, - CustomHostnameListResponse, - CustomHostnameCreateResponse, - CustomHostnameDeleteResponse, custom_hostname_edit_params, custom_hostname_list_params, custom_hostname_create_params, custom_hostname_delete_params, ) +from ...types.custom_hostnames.custom_hostname_get_response import CustomHostnameGetResponse +from ...types.custom_hostnames.custom_hostname_edit_response import CustomHostnameEditResponse +from ...types.custom_hostnames.custom_hostname_list_response import CustomHostnameListResponse +from ...types.custom_hostnames.custom_hostname_create_response import CustomHostnameCreateResponse +from ...types.custom_hostnames.custom_hostname_delete_response import CustomHostnameDeleteResponse __all__ = ["CustomHostnames", "AsyncCustomHostnames"] diff --git a/src/cloudflare/resources/custom_hostnames/fallback_origin.py b/src/cloudflare/resources/custom_hostnames/fallback_origin.py index 9b4e9c17039..496ed7b3d0e 100644 --- a/src/cloudflare/resources/custom_hostnames/fallback_origin.py +++ b/src/cloudflare/resources/custom_hostnames/fallback_origin.py @@ -23,13 +23,10 @@ from ..._base_client import ( make_request_options, ) -from ...types.custom_hostnames import ( - FallbackOriginGetResponse, - FallbackOriginDeleteResponse, - FallbackOriginUpdateResponse, - fallback_origin_delete_params, - fallback_origin_update_params, -) +from ...types.custom_hostnames import fallback_origin_delete_params, fallback_origin_update_params +from ...types.custom_hostnames.fallback_origin_get_response import FallbackOriginGetResponse +from ...types.custom_hostnames.fallback_origin_delete_response import FallbackOriginDeleteResponse +from ...types.custom_hostnames.fallback_origin_update_response import FallbackOriginUpdateResponse __all__ = ["FallbackOrigin", "AsyncFallbackOrigin"] diff --git a/src/cloudflare/resources/custom_nameservers.py b/src/cloudflare/resources/custom_nameservers.py index 18f69d97903..2daff60afbc 100644 --- a/src/cloudflare/resources/custom_nameservers.py +++ b/src/cloudflare/resources/custom_nameservers.py @@ -24,15 +24,15 @@ make_request_options, ) from ..types.custom_nameservers import ( - CustomNameserver, - CustomNameserverGetResponse, - CustomNameserverDeleteResponse, - CustomNameserverVerifyResponse, - CustomNameserverAvailabiltyResponse, custom_nameserver_create_params, custom_nameserver_delete_params, custom_nameserver_verify_params, ) +from ..types.custom_nameservers.custom_nameserver import CustomNameserver +from ..types.custom_nameservers.custom_nameserver_get_response import CustomNameserverGetResponse +from ..types.custom_nameservers.custom_nameserver_delete_response import CustomNameserverDeleteResponse +from ..types.custom_nameservers.custom_nameserver_verify_response import CustomNameserverVerifyResponse +from ..types.custom_nameservers.custom_nameserver_availabilty_response import CustomNameserverAvailabiltyResponse __all__ = ["CustomNameservers", "AsyncCustomNameservers"] diff --git a/src/cloudflare/resources/d1/database.py b/src/cloudflare/resources/d1/database.py index 596c352ae56..7649e14ee7e 100644 --- a/src/cloudflare/resources/d1/database.py +++ b/src/cloudflare/resources/d1/database.py @@ -12,16 +12,7 @@ async_maybe_transform, ) from ..._compat import cached_property -from ...types.d1 import ( - D1, - DatabaseListResponse, - DatabaseQueryResponse, - DatabaseCreateResponse, - DatabaseDeleteResponse, - database_list_params, - database_query_params, - database_create_params, -) +from ...types.d1 import database_list_params, database_query_params, database_create_params from ..._resource import SyncAPIResource, AsyncAPIResource from ..._response import ( to_raw_response_wrapper, @@ -31,10 +22,15 @@ ) from ..._wrappers import ResultWrapper from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray +from ...types.d1.d1 import D1 from ..._base_client import ( AsyncPaginator, make_request_options, ) +from ...types.d1.database_list_response import DatabaseListResponse +from ...types.d1.database_query_response import DatabaseQueryResponse +from ...types.d1.database_create_response import DatabaseCreateResponse +from ...types.d1.database_delete_response import DatabaseDeleteResponse __all__ = ["Database", "AsyncDatabase"] diff --git a/src/cloudflare/resources/dcv_delegation/uuid.py b/src/cloudflare/resources/dcv_delegation/uuid.py index aead0928b16..80b17040269 100644 --- a/src/cloudflare/resources/dcv_delegation/uuid.py +++ b/src/cloudflare/resources/dcv_delegation/uuid.py @@ -19,7 +19,7 @@ from ..._base_client import ( make_request_options, ) -from ...types.dcv_delegation import DCVDelegationUUID +from ...types.dcv_delegation.dcv_delegation_uuid import DCVDelegationUUID __all__ = ["UUID", "AsyncUUID"] diff --git a/src/cloudflare/resources/diagnostics/traceroutes.py b/src/cloudflare/resources/diagnostics/traceroutes.py index a96084218cb..f6f3e218ec5 100644 --- a/src/cloudflare/resources/diagnostics/traceroutes.py +++ b/src/cloudflare/resources/diagnostics/traceroutes.py @@ -23,7 +23,8 @@ from ..._base_client import ( make_request_options, ) -from ...types.diagnostics import TracerouteCreateResponse, traceroute_create_params +from ...types.diagnostics import traceroute_create_params +from ...types.diagnostics.traceroute_create_response import TracerouteCreateResponse __all__ = ["Traceroutes", "AsyncTraceroutes"] diff --git a/src/cloudflare/resources/dns/analytics/reports/bytimes.py b/src/cloudflare/resources/dns/analytics/reports/bytimes.py index cff57c62326..5c2899becbc 100644 --- a/src/cloudflare/resources/dns/analytics/reports/bytimes.py +++ b/src/cloudflare/resources/dns/analytics/reports/bytimes.py @@ -25,7 +25,8 @@ from ....._base_client import ( make_request_options, ) -from .....types.dns.analytics.reports import ByTime, bytime_get_params +from .....types.dns.analytics.reports import bytime_get_params +from .....types.dns.analytics.reports.by_time import ByTime __all__ = ["Bytimes", "AsyncBytimes"] diff --git a/src/cloudflare/resources/dns/analytics/reports/reports.py b/src/cloudflare/resources/dns/analytics/reports/reports.py index b39e27cda24..3eda553abad 100644 --- a/src/cloudflare/resources/dns/analytics/reports/reports.py +++ b/src/cloudflare/resources/dns/analytics/reports/reports.py @@ -32,7 +32,8 @@ from ....._base_client import ( make_request_options, ) -from .....types.dns.analytics import Report, report_get_params +from .....types.dns.analytics import report_get_params +from .....types.dns.analytics.report import Report __all__ = ["Reports", "AsyncReports"] diff --git a/src/cloudflare/resources/dns/firewall/analytics/reports/bytimes.py b/src/cloudflare/resources/dns/firewall/analytics/reports/bytimes.py index 8576b73e0ad..7b19935235a 100644 --- a/src/cloudflare/resources/dns/firewall/analytics/reports/bytimes.py +++ b/src/cloudflare/resources/dns/firewall/analytics/reports/bytimes.py @@ -25,7 +25,7 @@ from ......_base_client import ( make_request_options, ) -from ......types.dns.analytics.reports import ByTime +from ......types.dns.analytics.reports.by_time import ByTime from ......types.dns.firewall.analytics.reports import bytime_get_params __all__ = ["Bytimes", "AsyncBytimes"] diff --git a/src/cloudflare/resources/dns/firewall/analytics/reports/reports.py b/src/cloudflare/resources/dns/firewall/analytics/reports/reports.py index 256f12a4ce4..054ab85e35c 100644 --- a/src/cloudflare/resources/dns/firewall/analytics/reports/reports.py +++ b/src/cloudflare/resources/dns/firewall/analytics/reports/reports.py @@ -32,7 +32,7 @@ from ......_base_client import ( make_request_options, ) -from ......types.dns.analytics import Report +from ......types.dns.analytics.report import Report from ......types.dns.firewall.analytics import report_get_params __all__ = ["Reports", "AsyncReports"] diff --git a/src/cloudflare/resources/dns/firewall/firewall.py b/src/cloudflare/resources/dns/firewall/firewall.py index 17b1335c9b3..2836b849012 100644 --- a/src/cloudflare/resources/dns/firewall/firewall.py +++ b/src/cloudflare/resources/dns/firewall/firewall.py @@ -29,10 +29,6 @@ ) from ...._wrappers import ResultWrapper from ....types.dns import ( - FirewallIPsParam, - UpstreamIPsParam, - AttackMitigationParam, - FirewallDeleteResponse, firewall_edit_params, firewall_list_params, firewall_create_params, @@ -44,7 +40,11 @@ make_request_options, ) from .analytics.analytics import Analytics, AsyncAnalytics -from ....types.dns.firewall import Firewall +from ....types.dns.firewall.firewall import Firewall +from ....types.dns.firewall_ips_param import FirewallIPsParam +from ....types.dns.upstream_ips_param import UpstreamIPsParam +from ....types.dns.attack_mitigation_param import AttackMitigationParam +from ....types.dns.firewall_delete_response import FirewallDeleteResponse __all__ = ["FirewallResource", "AsyncFirewallResource"] diff --git a/src/cloudflare/resources/dns/records.py b/src/cloudflare/resources/dns/records.py index 6bdd4cd4579..e5dbf872ba1 100644 --- a/src/cloudflare/resources/dns/records.py +++ b/src/cloudflare/resources/dns/records.py @@ -23,12 +23,6 @@ ) from ..._wrappers import ResultWrapper from ...types.dns import ( - Record, - TTLParam, - RecordTags, - RecordScanResponse, - RecordDeleteResponse, - RecordImportResponse, record_edit_params, record_list_params, record_scan_params, @@ -42,6 +36,12 @@ AsyncPaginator, make_request_options, ) +from ...types.dns.record import Record +from ...types.dns.ttl_param import TTLParam +from ...types.dns.record_tags import RecordTags +from ...types.dns.record_scan_response import RecordScanResponse +from ...types.dns.record_delete_response import RecordDeleteResponse +from ...types.dns.record_import_response import RecordImportResponse __all__ = ["Records", "AsyncRecords"] diff --git a/src/cloudflare/resources/dnssec.py b/src/cloudflare/resources/dnssec.py index 4f85f2f6f3a..e4e171d640a 100644 --- a/src/cloudflare/resources/dnssec.py +++ b/src/cloudflare/resources/dnssec.py @@ -24,7 +24,9 @@ from .._base_client import ( make_request_options, ) -from ..types.dnssec import DNSSEC, DNSSECDeleteResponse, dnssec_edit_params, dnssec_delete_params +from ..types.dnssec import dnssec_edit_params, dnssec_delete_params +from ..types.dnssec.dnssec import DNSSEC +from ..types.dnssec.dnssec_delete_response import DNSSECDeleteResponse __all__ = ["DNSSECResource", "AsyncDNSSECResource"] diff --git a/src/cloudflare/resources/durable_objects/namespaces/namespaces.py b/src/cloudflare/resources/durable_objects/namespaces/namespaces.py index 86abe9b9665..0f73d1a11cd 100644 --- a/src/cloudflare/resources/durable_objects/namespaces/namespaces.py +++ b/src/cloudflare/resources/durable_objects/namespaces/namespaces.py @@ -26,7 +26,7 @@ AsyncPaginator, make_request_options, ) -from ....types.durable_objects import Namespace +from ....types.durable_objects.namespace import Namespace __all__ = ["Namespaces", "AsyncNamespaces"] diff --git a/src/cloudflare/resources/durable_objects/namespaces/objects.py b/src/cloudflare/resources/durable_objects/namespaces/objects.py index 721e40b19d4..be200e97aff 100644 --- a/src/cloudflare/resources/durable_objects/namespaces/objects.py +++ b/src/cloudflare/resources/durable_objects/namespaces/objects.py @@ -19,7 +19,8 @@ AsyncPaginator, make_request_options, ) -from ....types.durable_objects.namespaces import DurableObject, object_list_params +from ....types.durable_objects.namespaces import object_list_params +from ....types.durable_objects.namespaces.durable_object import DurableObject __all__ = ["Objects", "AsyncObjects"] diff --git a/src/cloudflare/resources/email_routing/addresses.py b/src/cloudflare/resources/email_routing/addresses.py index 511dcc11437..5ed109148ff 100644 --- a/src/cloudflare/resources/email_routing/addresses.py +++ b/src/cloudflare/resources/email_routing/addresses.py @@ -26,7 +26,8 @@ AsyncPaginator, make_request_options, ) -from ...types.email_routing import Address, address_list_params, address_create_params +from ...types.email_routing import address_list_params, address_create_params +from ...types.email_routing.address import Address __all__ = ["Addresses", "AsyncAddresses"] diff --git a/src/cloudflare/resources/email_routing/dns.py b/src/cloudflare/resources/email_routing/dns.py index 2a367da0e07..a9ea21ff895 100644 --- a/src/cloudflare/resources/email_routing/dns.py +++ b/src/cloudflare/resources/email_routing/dns.py @@ -19,7 +19,7 @@ from ..._base_client import ( make_request_options, ) -from ...types.email_routing import DNSGetResponse +from ...types.email_routing.dns_get_response import DNSGetResponse __all__ = ["DNS", "AsyncDNS"] diff --git a/src/cloudflare/resources/email_routing/email_routing.py b/src/cloudflare/resources/email_routing/email_routing.py index 63135544311..1c7995b9f1a 100644 --- a/src/cloudflare/resources/email_routing/email_routing.py +++ b/src/cloudflare/resources/email_routing/email_routing.py @@ -48,7 +48,8 @@ from ..._base_client import ( make_request_options, ) -from ...types.email_routing import Settings, email_routing_enable_params, email_routing_disable_params +from ...types.email_routing import email_routing_enable_params, email_routing_disable_params +from ...types.email_routing.settings import Settings __all__ = ["EmailRouting", "AsyncEmailRouting"] diff --git a/src/cloudflare/resources/email_routing/rules/catch_alls.py b/src/cloudflare/resources/email_routing/rules/catch_alls.py index 3e15171f2a5..06f461a87c1 100644 --- a/src/cloudflare/resources/email_routing/rules/catch_alls.py +++ b/src/cloudflare/resources/email_routing/rules/catch_alls.py @@ -24,13 +24,11 @@ from ...._base_client import ( make_request_options, ) -from ....types.email_routing.rules import ( - CatchAllActionParam, - CatchAllGetResponse, - CatchAllMatcherParam, - CatchAllUpdateResponse, - catch_all_update_params, -) +from ....types.email_routing.rules import catch_all_update_params +from ....types.email_routing.rules.catch_all_action_param import CatchAllActionParam +from ....types.email_routing.rules.catch_all_get_response import CatchAllGetResponse +from ....types.email_routing.rules.catch_all_matcher_param import CatchAllMatcherParam +from ....types.email_routing.rules.catch_all_update_response import CatchAllUpdateResponse __all__ = ["CatchAlls", "AsyncCatchAlls"] diff --git a/src/cloudflare/resources/email_routing/rules/rules.py b/src/cloudflare/resources/email_routing/rules/rules.py index 9d57fa137d6..e0c462767db 100644 --- a/src/cloudflare/resources/email_routing/rules/rules.py +++ b/src/cloudflare/resources/email_routing/rules/rules.py @@ -34,14 +34,10 @@ AsyncPaginator, make_request_options, ) -from ....types.email_routing import ( - ActionParam, - MatcherParam, - EmailRoutingRule, - rule_list_params, - rule_create_params, - rule_update_params, -) +from ....types.email_routing import rule_list_params, rule_create_params, rule_update_params +from ....types.email_routing.action_param import ActionParam +from ....types.email_routing.matcher_param import MatcherParam +from ....types.email_routing.email_routing_rule import EmailRoutingRule __all__ = ["Rules", "AsyncRules"] diff --git a/src/cloudflare/resources/event_notifications/r2/configuration/configuration.py b/src/cloudflare/resources/event_notifications/r2/configuration/configuration.py index 9d8bd227347..e35606b75a4 100644 --- a/src/cloudflare/resources/event_notifications/r2/configuration/configuration.py +++ b/src/cloudflare/resources/event_notifications/r2/configuration/configuration.py @@ -27,7 +27,7 @@ from ....._base_client import ( make_request_options, ) -from .....types.event_notifications.r2 import ConfigurationGetResponse +from .....types.event_notifications.r2.configuration_get_response import ConfigurationGetResponse __all__ = ["Configuration", "AsyncConfiguration"] diff --git a/src/cloudflare/resources/event_notifications/r2/configuration/queues.py b/src/cloudflare/resources/event_notifications/r2/configuration/queues.py index 21b6facf10a..9b0424fe528 100644 --- a/src/cloudflare/resources/event_notifications/r2/configuration/queues.py +++ b/src/cloudflare/resources/event_notifications/r2/configuration/queues.py @@ -23,11 +23,9 @@ from ....._base_client import ( make_request_options, ) -from .....types.event_notifications.r2.configuration import ( - QueueDeleteResponse, - QueueUpdateResponse, - queue_update_params, -) +from .....types.event_notifications.r2.configuration import queue_update_params +from .....types.event_notifications.r2.configuration.queue_delete_response import QueueDeleteResponse +from .....types.event_notifications.r2.configuration.queue_update_response import QueueUpdateResponse __all__ = ["Queues", "AsyncQueues"] diff --git a/src/cloudflare/resources/filters.py b/src/cloudflare/resources/filters.py index 04311551157..3aa2fd06456 100644 --- a/src/cloudflare/resources/filters.py +++ b/src/cloudflare/resources/filters.py @@ -25,14 +25,9 @@ AsyncPaginator, make_request_options, ) -from ..types.filters import ( - FirewallFilter, - FilterCreateResponse, - filter_list_params, - filter_create_params, - filter_delete_params, - filter_update_params, -) +from ..types.filters import filter_list_params, filter_create_params, filter_delete_params, filter_update_params +from ..types.filters.firewall_filter import FirewallFilter +from ..types.filters.filter_create_response import FilterCreateResponse __all__ = ["Filters", "AsyncFilters"] diff --git a/src/cloudflare/resources/firewall/access_rules.py b/src/cloudflare/resources/firewall/access_rules.py index 8e0c5998f63..4a5ad2d68da 100644 --- a/src/cloudflare/resources/firewall/access_rules.py +++ b/src/cloudflare/resources/firewall/access_rules.py @@ -27,15 +27,15 @@ make_request_options, ) from ...types.firewall import ( - AccessRuleGetResponse, - AccessRuleEditResponse, - AccessRuleCreateResponse, - AccessRuleDeleteResponse, access_rule_edit_params, access_rule_list_params, access_rule_create_params, access_rule_delete_params, ) +from ...types.firewall.access_rule_get_response import AccessRuleGetResponse +from ...types.firewall.access_rule_edit_response import AccessRuleEditResponse +from ...types.firewall.access_rule_create_response import AccessRuleCreateResponse +from ...types.firewall.access_rule_delete_response import AccessRuleDeleteResponse __all__ = ["AccessRules", "AsyncAccessRules"] diff --git a/src/cloudflare/resources/firewall/lockdowns.py b/src/cloudflare/resources/firewall/lockdowns.py index b38ae45ac16..1dbb4f10d39 100644 --- a/src/cloudflare/resources/firewall/lockdowns.py +++ b/src/cloudflare/resources/firewall/lockdowns.py @@ -27,13 +27,13 @@ make_request_options, ) from ...types.firewall import ( - Lockdown, - LockdownDeleteResponse, lockdown_list_params, lockdown_create_params, lockdown_delete_params, lockdown_update_params, ) +from ...types.firewall.lockdown import Lockdown +from ...types.firewall.lockdown_delete_response import LockdownDeleteResponse __all__ = ["Lockdowns", "AsyncLockdowns"] diff --git a/src/cloudflare/resources/firewall/rules.py b/src/cloudflare/resources/firewall/rules.py index a903a6a1c52..3e8b3629243 100644 --- a/src/cloudflare/resources/firewall/rules.py +++ b/src/cloudflare/resources/firewall/rules.py @@ -26,9 +26,6 @@ make_request_options, ) from ...types.firewall import ( - FirewallRule, - RuleEditResponse, - RuleCreateResponse, rule_get_params, rule_edit_params, rule_list_params, @@ -36,6 +33,9 @@ rule_delete_params, rule_update_params, ) +from ...types.firewall.firewall_rule import FirewallRule +from ...types.firewall.rule_edit_response import RuleEditResponse +from ...types.firewall.rule_create_response import RuleCreateResponse __all__ = ["Rules", "AsyncRules"] diff --git a/src/cloudflare/resources/firewall/ua_rules.py b/src/cloudflare/resources/firewall/ua_rules.py index c82ada64b1e..5d402a64491 100644 --- a/src/cloudflare/resources/firewall/ua_rules.py +++ b/src/cloudflare/resources/firewall/ua_rules.py @@ -25,17 +25,12 @@ AsyncPaginator, make_request_options, ) -from ...types.firewall import ( - UARuleGetResponse, - UARuleListResponse, - UARuleCreateResponse, - UARuleDeleteResponse, - UARuleUpdateResponse, - ua_rule_list_params, - ua_rule_create_params, - ua_rule_delete_params, - ua_rule_update_params, -) +from ...types.firewall import ua_rule_list_params, ua_rule_create_params, ua_rule_delete_params, ua_rule_update_params +from ...types.firewall.ua_rule_get_response import UARuleGetResponse +from ...types.firewall.ua_rule_list_response import UARuleListResponse +from ...types.firewall.ua_rule_create_response import UARuleCreateResponse +from ...types.firewall.ua_rule_delete_response import UARuleDeleteResponse +from ...types.firewall.ua_rule_update_response import UARuleUpdateResponse __all__ = ["UARules", "AsyncUARules"] diff --git a/src/cloudflare/resources/firewall/waf/overrides.py b/src/cloudflare/resources/firewall/waf/overrides.py index 589c76a5cd4..52214babf21 100644 --- a/src/cloudflare/resources/firewall/waf/overrides.py +++ b/src/cloudflare/resources/firewall/waf/overrides.py @@ -26,13 +26,13 @@ make_request_options, ) from ....types.firewall.waf import ( - Override, - OverrideDeleteResponse, override_list_params, override_create_params, override_delete_params, override_update_params, ) +from ....types.firewall.waf.override import Override +from ....types.firewall.waf.override_delete_response import OverrideDeleteResponse __all__ = ["Overrides", "AsyncOverrides"] diff --git a/src/cloudflare/resources/firewall/waf/packages/groups.py b/src/cloudflare/resources/firewall/waf/packages/groups.py index 2f4031e99d4..25c7fdb484b 100644 --- a/src/cloudflare/resources/firewall/waf/packages/groups.py +++ b/src/cloudflare/resources/firewall/waf/packages/groups.py @@ -26,13 +26,10 @@ AsyncPaginator, make_request_options, ) -from .....types.firewall.waf.packages import ( - Group, - GroupGetResponse, - GroupEditResponse, - group_edit_params, - group_list_params, -) +from .....types.firewall.waf.packages import group_edit_params, group_list_params +from .....types.firewall.waf.packages.group import Group +from .....types.firewall.waf.packages.group_get_response import GroupGetResponse +from .....types.firewall.waf.packages.group_edit_response import GroupEditResponse __all__ = ["Groups", "AsyncGroups"] diff --git a/src/cloudflare/resources/firewall/waf/packages/packages.py b/src/cloudflare/resources/firewall/waf/packages/packages.py index baad2052735..748bd19e329 100644 --- a/src/cloudflare/resources/firewall/waf/packages/packages.py +++ b/src/cloudflare/resources/firewall/waf/packages/packages.py @@ -38,7 +38,9 @@ AsyncPaginator, make_request_options, ) -from .....types.firewall.waf import PackageGetResponse, PackageListResponse, package_list_params +from .....types.firewall.waf import package_list_params +from .....types.firewall.waf.package_get_response import PackageGetResponse +from .....types.firewall.waf.package_list_response import PackageListResponse __all__ = ["Packages", "AsyncPackages"] diff --git a/src/cloudflare/resources/firewall/waf/packages/rules.py b/src/cloudflare/resources/firewall/waf/packages/rules.py index 2ab73d4ee7b..44886402a95 100644 --- a/src/cloudflare/resources/firewall/waf/packages/rules.py +++ b/src/cloudflare/resources/firewall/waf/packages/rules.py @@ -26,13 +26,10 @@ AsyncPaginator, make_request_options, ) -from .....types.firewall.waf.packages import ( - RuleGetResponse, - RuleEditResponse, - RuleListResponse, - rule_edit_params, - rule_list_params, -) +from .....types.firewall.waf.packages import rule_edit_params, rule_list_params +from .....types.firewall.waf.packages.rule_get_response import RuleGetResponse +from .....types.firewall.waf.packages.rule_edit_response import RuleEditResponse +from .....types.firewall.waf.packages.rule_list_response import RuleListResponse __all__ = ["Rules", "AsyncRules"] diff --git a/src/cloudflare/resources/healthchecks/healthchecks.py b/src/cloudflare/resources/healthchecks/healthchecks.py index 054a1dc49e0..b0252266fc0 100644 --- a/src/cloudflare/resources/healthchecks/healthchecks.py +++ b/src/cloudflare/resources/healthchecks/healthchecks.py @@ -34,17 +34,17 @@ make_request_options, ) from ...types.healthchecks import ( - CheckRegion, - Healthcheck, - TCPConfigurationParam, - HTTPConfigurationParam, - HealthcheckDeleteResponse, healthcheck_edit_params, healthcheck_list_params, healthcheck_create_params, healthcheck_delete_params, healthcheck_update_params, ) +from ...types.healthchecks.healthcheck import Healthcheck +from ...types.healthchecks.check_region import CheckRegion +from ...types.healthchecks.tcp_configuration_param import TCPConfigurationParam +from ...types.healthchecks.http_configuration_param import HTTPConfigurationParam +from ...types.healthchecks.healthcheck_delete_response import HealthcheckDeleteResponse __all__ = ["Healthchecks", "AsyncHealthchecks"] diff --git a/src/cloudflare/resources/healthchecks/previews.py b/src/cloudflare/resources/healthchecks/previews.py index ff37ec035e7..2386d71befa 100644 --- a/src/cloudflare/resources/healthchecks/previews.py +++ b/src/cloudflare/resources/healthchecks/previews.py @@ -23,15 +23,12 @@ from ..._base_client import ( make_request_options, ) -from ...types.healthchecks import ( - CheckRegion, - Healthcheck, - PreviewDeleteResponse, - TCPConfigurationParam, - HTTPConfigurationParam, - preview_create_params, - preview_delete_params, -) +from ...types.healthchecks import preview_create_params, preview_delete_params +from ...types.healthchecks.healthcheck import Healthcheck +from ...types.healthchecks.check_region import CheckRegion +from ...types.healthchecks.preview_delete_response import PreviewDeleteResponse +from ...types.healthchecks.tcp_configuration_param import TCPConfigurationParam +from ...types.healthchecks.http_configuration_param import HTTPConfigurationParam __all__ = ["Previews", "AsyncPreviews"] diff --git a/src/cloudflare/resources/hostnames/settings/tls.py b/src/cloudflare/resources/hostnames/settings/tls.py index 715d9af6be5..81566bd340d 100644 --- a/src/cloudflare/resources/hostnames/settings/tls.py +++ b/src/cloudflare/resources/hostnames/settings/tls.py @@ -24,13 +24,11 @@ from ...._base_client import ( make_request_options, ) -from ....types.hostnames.settings import ( - Setting, - TLSGetResponse, - SettingValueParam, - TLSDeleteResponse, - tls_update_params, -) +from ....types.hostnames.settings import tls_update_params +from ....types.hostnames.settings.setting import Setting +from ....types.hostnames.settings.tls_get_response import TLSGetResponse +from ....types.hostnames.settings.setting_value_param import SettingValueParam +from ....types.hostnames.settings.tls_delete_response import TLSDeleteResponse __all__ = ["TLS", "AsyncTLS"] diff --git a/src/cloudflare/resources/hyperdrive/configs.py b/src/cloudflare/resources/hyperdrive/configs.py index 6a28d181581..6c06d35c3d2 100644 --- a/src/cloudflare/resources/hyperdrive/configs.py +++ b/src/cloudflare/resources/hyperdrive/configs.py @@ -25,14 +25,10 @@ AsyncPaginator, make_request_options, ) -from ...types.hyperdrive import ( - Hyperdrive, - ConfigurationParam, - ConfigDeleteResponse, - config_edit_params, - config_create_params, - config_update_params, -) +from ...types.hyperdrive import config_edit_params, config_create_params, config_update_params +from ...types.hyperdrive.hyperdrive import Hyperdrive +from ...types.hyperdrive.configuration_param import ConfigurationParam +from ...types.hyperdrive.config_delete_response import ConfigDeleteResponse __all__ = ["Configs", "AsyncConfigs"] diff --git a/src/cloudflare/resources/images/v1/keys.py b/src/cloudflare/resources/images/v1/keys.py index abfd8e801bc..11886a84c68 100644 --- a/src/cloudflare/resources/images/v1/keys.py +++ b/src/cloudflare/resources/images/v1/keys.py @@ -19,7 +19,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.images.v1 import KeyListResponse, KeyDeleteResponse, KeyUpdateResponse +from ....types.images.v1.key_list_response import KeyListResponse +from ....types.images.v1.key_delete_response import KeyDeleteResponse +from ....types.images.v1.key_update_response import KeyUpdateResponse __all__ = ["Keys", "AsyncKeys"] diff --git a/src/cloudflare/resources/images/v1/stats.py b/src/cloudflare/resources/images/v1/stats.py index 6f548839921..a29bd173e2a 100644 --- a/src/cloudflare/resources/images/v1/stats.py +++ b/src/cloudflare/resources/images/v1/stats.py @@ -19,7 +19,7 @@ from ...._base_client import ( make_request_options, ) -from ....types.images.v1 import Stat +from ....types.images.v1.stat import Stat __all__ = ["Stats", "AsyncStats"] diff --git a/src/cloudflare/resources/images/v1/v1.py b/src/cloudflare/resources/images/v1/v1.py index fcf9580c529..1d95d9abf5b 100644 --- a/src/cloudflare/resources/images/v1/v1.py +++ b/src/cloudflare/resources/images/v1/v1.py @@ -57,15 +57,10 @@ AsyncPaginator, make_request_options, ) -from ....types.images import ( - Image, - V1ListResponse, - V1DeleteResponse, - v1_edit_params, - v1_list_params, - v1_create_params, - v1_delete_params, -) +from ....types.images import v1_edit_params, v1_list_params, v1_create_params, v1_delete_params +from ....types.images.image import Image +from ....types.images.v1_list_response import V1ListResponse +from ....types.images.v1_delete_response import V1DeleteResponse __all__ = ["V1", "AsyncV1"] diff --git a/src/cloudflare/resources/images/v1/variants.py b/src/cloudflare/resources/images/v1/variants.py index 516137b8b05..dee5e6da519 100644 --- a/src/cloudflare/resources/images/v1/variants.py +++ b/src/cloudflare/resources/images/v1/variants.py @@ -23,16 +23,12 @@ from ...._base_client import ( make_request_options, ) -from ....types.images.v1 import ( - Variant, - VariantGetResponse, - VariantEditResponse, - VariantCreateResponse, - VariantDeleteResponse, - variant_edit_params, - variant_create_params, - variant_delete_params, -) +from ....types.images.v1 import variant_edit_params, variant_create_params, variant_delete_params +from ....types.images.v1.variant import Variant +from ....types.images.v1.variant_get_response import VariantGetResponse +from ....types.images.v1.variant_edit_response import VariantEditResponse +from ....types.images.v1.variant_create_response import VariantCreateResponse +from ....types.images.v1.variant_delete_response import VariantDeleteResponse __all__ = ["Variants", "AsyncVariants"] diff --git a/src/cloudflare/resources/images/v2/direct_uploads.py b/src/cloudflare/resources/images/v2/direct_uploads.py index 16d13572592..d448cd4093f 100644 --- a/src/cloudflare/resources/images/v2/direct_uploads.py +++ b/src/cloudflare/resources/images/v2/direct_uploads.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.images.v2 import DirectUploadCreateResponse, direct_upload_create_params +from ....types.images.v2 import direct_upload_create_params +from ....types.images.v2.direct_upload_create_response import DirectUploadCreateResponse __all__ = ["DirectUploads", "AsyncDirectUploads"] diff --git a/src/cloudflare/resources/images/v2/v2.py b/src/cloudflare/resources/images/v2/v2.py index fecedde622d..e0991e27583 100644 --- a/src/cloudflare/resources/images/v2/v2.py +++ b/src/cloudflare/resources/images/v2/v2.py @@ -32,7 +32,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.images import V2ListResponse, v2_list_params +from ....types.images import v2_list_params +from ....types.images.v2_list_response import V2ListResponse __all__ = ["V2", "AsyncV2"] diff --git a/src/cloudflare/resources/intel/asn/subnets.py b/src/cloudflare/resources/intel/asn/subnets.py index 4a7df70b55d..d3f5f2c406b 100644 --- a/src/cloudflare/resources/intel/asn/subnets.py +++ b/src/cloudflare/resources/intel/asn/subnets.py @@ -16,8 +16,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.shared import ASN -from ....types.intel.asn import SubnetGetResponse +from ....types.shared.asn import ASN +from ....types.intel.asn.subnet_get_response import SubnetGetResponse __all__ = ["Subnets", "AsyncSubnets"] diff --git a/src/cloudflare/resources/intel/attack_surface_report/issue_types.py b/src/cloudflare/resources/intel/attack_surface_report/issue_types.py index 806e8d6f645..99ca50bd2d3 100644 --- a/src/cloudflare/resources/intel/attack_surface_report/issue_types.py +++ b/src/cloudflare/resources/intel/attack_surface_report/issue_types.py @@ -19,7 +19,7 @@ from ...._base_client import ( make_request_options, ) -from ....types.intel.attack_surface_report import IssueTypeGetResponse +from ....types.intel.attack_surface_report.issue_type_get_response import IssueTypeGetResponse __all__ = ["IssueTypes", "AsyncIssueTypes"] diff --git a/src/cloudflare/resources/intel/attack_surface_report/issues.py b/src/cloudflare/resources/intel/attack_surface_report/issues.py index 76f9e4d48f6..db255519afb 100644 --- a/src/cloudflare/resources/intel/attack_surface_report/issues.py +++ b/src/cloudflare/resources/intel/attack_surface_report/issues.py @@ -26,22 +26,22 @@ make_request_options, ) from ....types.intel.attack_surface_report import ( - IssueType, - ProductParam, - SubjectParam, - IssueClassParam, - IssueListResponse, - IssueTypeResponse, - IssueClassResponse, - SeverityQueryParam, - IssueDismissResponse, - IssueSeverityResponse, issue_list_params, issue_type_params, issue_class_params, issue_dismiss_params, issue_severity_params, ) +from ....types.intel.attack_surface_report.issue_type import IssueType +from ....types.intel.attack_surface_report.product_param import ProductParam +from ....types.intel.attack_surface_report.subject_param import SubjectParam +from ....types.intel.attack_surface_report.issue_class_param import IssueClassParam +from ....types.intel.attack_surface_report.issue_list_response import IssueListResponse +from ....types.intel.attack_surface_report.issue_type_response import IssueTypeResponse +from ....types.intel.attack_surface_report.issue_class_response import IssueClassResponse +from ....types.intel.attack_surface_report.severity_query_param import SeverityQueryParam +from ....types.intel.attack_surface_report.issue_dismiss_response import IssueDismissResponse +from ....types.intel.attack_surface_report.issue_severity_response import IssueSeverityResponse __all__ = ["Issues", "AsyncIssues"] diff --git a/src/cloudflare/resources/intel/dns.py b/src/cloudflare/resources/intel/dns.py index a74d19434c6..ae3c37cb6b2 100644 --- a/src/cloudflare/resources/intel/dns.py +++ b/src/cloudflare/resources/intel/dns.py @@ -15,11 +15,12 @@ async_to_streamed_response_wrapper, ) from ...pagination import SyncV4PagePagination, AsyncV4PagePagination -from ...types.intel import DNSListResponse, dns_list_params +from ...types.intel import dns_list_params from ..._base_client import ( AsyncPaginator, make_request_options, ) +from ...types.intel.dns_list_response import DNSListResponse __all__ = ["DNS", "AsyncDNS"] diff --git a/src/cloudflare/resources/intel/domain_history.py b/src/cloudflare/resources/intel/domain_history.py index 0f0b2e78f22..01f977b3b72 100644 --- a/src/cloudflare/resources/intel/domain_history.py +++ b/src/cloudflare/resources/intel/domain_history.py @@ -20,10 +20,11 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.intel import DomainHistoryGetResponse, domain_history_get_params +from ...types.intel import domain_history_get_params from ..._base_client import ( make_request_options, ) +from ...types.intel.domain_history_get_response import DomainHistoryGetResponse __all__ = ["DomainHistoryResource", "AsyncDomainHistoryResource"] diff --git a/src/cloudflare/resources/intel/domains/bulks.py b/src/cloudflare/resources/intel/domains/bulks.py index 9aa5e5c8a78..ef41f24359b 100644 --- a/src/cloudflare/resources/intel/domains/bulks.py +++ b/src/cloudflare/resources/intel/domains/bulks.py @@ -23,7 +23,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.intel.domains import BulkGetResponse, bulk_get_params +from ....types.intel.domains import bulk_get_params +from ....types.intel.domains.bulk_get_response import BulkGetResponse __all__ = ["Bulks", "AsyncBulks"] diff --git a/src/cloudflare/resources/intel/domains/domains.py b/src/cloudflare/resources/intel/domains/domains.py index cfddf4ac221..c8e3d1f853a 100644 --- a/src/cloudflare/resources/intel/domains/domains.py +++ b/src/cloudflare/resources/intel/domains/domains.py @@ -28,10 +28,11 @@ async_to_streamed_response_wrapper, ) from ...._wrappers import ResultWrapper -from ....types.intel import Domain, domain_get_params +from ....types.intel import domain_get_params from ...._base_client import ( make_request_options, ) +from ....types.intel.domain import Domain __all__ = ["Domains", "AsyncDomains"] diff --git a/src/cloudflare/resources/intel/indicator_feeds/indicator_feeds.py b/src/cloudflare/resources/intel/indicator_feeds/indicator_feeds.py index 300a0a51625..3c921d09fbe 100644 --- a/src/cloudflare/resources/intel/indicator_feeds/indicator_feeds.py +++ b/src/cloudflare/resources/intel/indicator_feeds/indicator_feeds.py @@ -29,18 +29,15 @@ ) from ...._wrappers import ResultWrapper from ....pagination import SyncSinglePage, AsyncSinglePage -from ....types.intel import ( - IndicatorFeedGetResponse, - IndicatorFeedListResponse, - IndicatorFeedCreateResponse, - IndicatorFeedUpdateResponse, - indicator_feed_create_params, - indicator_feed_update_params, -) +from ....types.intel import indicator_feed_create_params, indicator_feed_update_params from ...._base_client import ( AsyncPaginator, make_request_options, ) +from ....types.intel.indicator_feed_get_response import IndicatorFeedGetResponse +from ....types.intel.indicator_feed_list_response import IndicatorFeedListResponse +from ....types.intel.indicator_feed_create_response import IndicatorFeedCreateResponse +from ....types.intel.indicator_feed_update_response import IndicatorFeedUpdateResponse __all__ = ["IndicatorFeeds", "AsyncIndicatorFeeds"] diff --git a/src/cloudflare/resources/intel/indicator_feeds/permissions.py b/src/cloudflare/resources/intel/indicator_feeds/permissions.py index 33aeb9d2b2a..961b5b57342 100644 --- a/src/cloudflare/resources/intel/indicator_feeds/permissions.py +++ b/src/cloudflare/resources/intel/indicator_feeds/permissions.py @@ -23,13 +23,10 @@ from ...._base_client import ( make_request_options, ) -from ....types.intel.indicator_feeds import ( - PermissionListResponse, - PermissionCreateResponse, - PermissionDeleteResponse, - permission_create_params, - permission_delete_params, -) +from ....types.intel.indicator_feeds import permission_create_params, permission_delete_params +from ....types.intel.indicator_feeds.permission_list_response import PermissionListResponse +from ....types.intel.indicator_feeds.permission_create_response import PermissionCreateResponse +from ....types.intel.indicator_feeds.permission_delete_response import PermissionDeleteResponse __all__ = ["Permissions", "AsyncPermissions"] diff --git a/src/cloudflare/resources/intel/ip_lists.py b/src/cloudflare/resources/intel/ip_lists.py index e12da28483d..8bd97aede85 100644 --- a/src/cloudflare/resources/intel/ip_lists.py +++ b/src/cloudflare/resources/intel/ip_lists.py @@ -16,10 +16,10 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.intel import IPListGetResponse from ..._base_client import ( make_request_options, ) +from ...types.intel.ip_list_get_response import IPListGetResponse __all__ = ["IPLists", "AsyncIPLists"] diff --git a/src/cloudflare/resources/intel/ips.py b/src/cloudflare/resources/intel/ips.py index bec547064b8..faec69245e1 100644 --- a/src/cloudflare/resources/intel/ips.py +++ b/src/cloudflare/resources/intel/ips.py @@ -20,10 +20,11 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.intel import IPGetResponse, ip_get_params +from ...types.intel import ip_get_params from ..._base_client import ( make_request_options, ) +from ...types.intel.ip_get_response import IPGetResponse __all__ = ["IPs", "AsyncIPs"] diff --git a/src/cloudflare/resources/intel/miscategorizations.py b/src/cloudflare/resources/intel/miscategorizations.py index af1302451f6..78abcc863e6 100644 --- a/src/cloudflare/resources/intel/miscategorizations.py +++ b/src/cloudflare/resources/intel/miscategorizations.py @@ -21,10 +21,11 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.intel import MiscategorizationCreateResponse, miscategorization_create_params +from ...types.intel import miscategorization_create_params from ..._base_client import ( make_request_options, ) +from ...types.intel.miscategorization_create_response import MiscategorizationCreateResponse __all__ = ["Miscategorizations", "AsyncMiscategorizations"] diff --git a/src/cloudflare/resources/intel/sinkholes.py b/src/cloudflare/resources/intel/sinkholes.py index 55d0f5faa9b..bf4ebc81fe8 100644 --- a/src/cloudflare/resources/intel/sinkholes.py +++ b/src/cloudflare/resources/intel/sinkholes.py @@ -14,11 +14,11 @@ async_to_streamed_response_wrapper, ) from ...pagination import SyncSinglePage, AsyncSinglePage -from ...types.intel import Sinkhole from ..._base_client import ( AsyncPaginator, make_request_options, ) +from ...types.intel.sinkhole import Sinkhole __all__ = ["Sinkholes", "AsyncSinkholes"] diff --git a/src/cloudflare/resources/ips.py b/src/cloudflare/resources/ips.py index d4cfc566d67..9c22854e0c4 100644 --- a/src/cloudflare/resources/ips.py +++ b/src/cloudflare/resources/ips.py @@ -20,10 +20,11 @@ async_to_streamed_response_wrapper, ) from .._wrappers import ResultWrapper -from ..types.ips import IPListResponse, ip_list_params +from ..types.ips import ip_list_params from .._base_client import ( make_request_options, ) +from ..types.ips.ip_list_response import IPListResponse __all__ = ["IPs", "AsyncIPs"] diff --git a/src/cloudflare/resources/keyless_certificates.py b/src/cloudflare/resources/keyless_certificates.py index 365924a02a9..43c52e2c1b3 100644 --- a/src/cloudflare/resources/keyless_certificates.py +++ b/src/cloudflare/resources/keyless_certificates.py @@ -27,13 +27,14 @@ ) from ..types.custom_hostnames import BundleMethod from ..types.keyless_certificates import ( - TunnelParam, - KeylessCertificate, - KeylessCertificateDeleteResponse, keyless_certificate_edit_params, keyless_certificate_create_params, keyless_certificate_delete_params, ) +from ..types.custom_hostnames.bundle_method import BundleMethod +from ..types.keyless_certificates.tunnel_param import TunnelParam +from ..types.keyless_certificates.keyless_certificate import KeylessCertificate +from ..types.keyless_certificates.keyless_certificate_delete_response import KeylessCertificateDeleteResponse __all__ = ["KeylessCertificates", "AsyncKeylessCertificates"] diff --git a/src/cloudflare/resources/kv/namespaces/bulk.py b/src/cloudflare/resources/kv/namespaces/bulk.py index 215318b7a4d..75110535dd8 100644 --- a/src/cloudflare/resources/kv/namespaces/bulk.py +++ b/src/cloudflare/resources/kv/namespaces/bulk.py @@ -23,7 +23,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.kv.namespaces import BulkDeleteResponse, BulkUpdateResponse, bulk_delete_params, bulk_update_params +from ....types.kv.namespaces import bulk_delete_params, bulk_update_params +from ....types.kv.namespaces.bulk_delete_response import BulkDeleteResponse +from ....types.kv.namespaces.bulk_update_response import BulkUpdateResponse __all__ = ["Bulk", "AsyncBulk"] diff --git a/src/cloudflare/resources/kv/namespaces/keys.py b/src/cloudflare/resources/kv/namespaces/keys.py index 10ba4df5c0b..a941bcfc65a 100644 --- a/src/cloudflare/resources/kv/namespaces/keys.py +++ b/src/cloudflare/resources/kv/namespaces/keys.py @@ -19,7 +19,8 @@ AsyncPaginator, make_request_options, ) -from ....types.kv.namespaces import Key, key_list_params +from ....types.kv.namespaces import key_list_params +from ....types.kv.namespaces.key import Key __all__ = ["Keys", "AsyncKeys"] diff --git a/src/cloudflare/resources/kv/namespaces/namespaces.py b/src/cloudflare/resources/kv/namespaces/namespaces.py index c7906b9c135..fd2acab2841 100644 --- a/src/cloudflare/resources/kv/namespaces/namespaces.py +++ b/src/cloudflare/resources/kv/namespaces/namespaces.py @@ -46,9 +46,6 @@ ) from ...._compat import cached_property from ....types.kv import ( - Namespace, - NamespaceDeleteResponse, - NamespaceUpdateResponse, namespace_list_params, namespace_create_params, namespace_delete_params, @@ -67,6 +64,9 @@ AsyncPaginator, make_request_options, ) +from ....types.kv.namespace import Namespace +from ....types.kv.namespace_delete_response import NamespaceDeleteResponse +from ....types.kv.namespace_update_response import NamespaceUpdateResponse __all__ = ["Namespaces", "AsyncNamespaces"] diff --git a/src/cloudflare/resources/kv/namespaces/values.py b/src/cloudflare/resources/kv/namespaces/values.py index e53a0d3fff5..3c6f8c282d4 100644 --- a/src/cloudflare/resources/kv/namespaces/values.py +++ b/src/cloudflare/resources/kv/namespaces/values.py @@ -23,12 +23,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.kv.namespaces import ( - ValueDeleteResponse, - ValueUpdateResponse, - value_delete_params, - value_update_params, -) +from ....types.kv.namespaces import value_delete_params, value_update_params +from ....types.kv.namespaces.value_delete_response import ValueDeleteResponse +from ....types.kv.namespaces.value_update_response import ValueUpdateResponse __all__ = ["Values", "AsyncValues"] diff --git a/src/cloudflare/resources/load_balancers/load_balancers.py b/src/cloudflare/resources/load_balancers/load_balancers.py index 0b922846c24..d87fa3f07c9 100644 --- a/src/cloudflare/resources/load_balancers/load_balancers.py +++ b/src/cloudflare/resources/load_balancers/load_balancers.py @@ -69,19 +69,19 @@ ) from .monitors.monitors import Monitors, AsyncMonitors from ...types.load_balancers import ( - RulesParam, - DefaultPools, - LoadBalancer, - RandomSteeringParam, - AdaptiveRoutingParam, - LocationStrategyParam, - LoadBalancerDeleteResponse, - SessionAffinityAttributesParam, load_balancer_edit_params, load_balancer_create_params, load_balancer_delete_params, load_balancer_update_params, ) +from ...types.load_balancers.rules_param import RulesParam +from ...types.load_balancers.default_pools import DefaultPools +from ...types.load_balancers.load_balancer import LoadBalancer +from ...types.load_balancers.random_steering_param import RandomSteeringParam +from ...types.load_balancers.adaptive_routing_param import AdaptiveRoutingParam +from ...types.load_balancers.location_strategy_param import LocationStrategyParam +from ...types.load_balancers.load_balancer_delete_response import LoadBalancerDeleteResponse +from ...types.load_balancers.session_affinity_attributes_param import SessionAffinityAttributesParam __all__ = ["LoadBalancers", "AsyncLoadBalancers"] diff --git a/src/cloudflare/resources/load_balancers/monitors/monitors.py b/src/cloudflare/resources/load_balancers/monitors/monitors.py index 90bf2cbad46..407a575ff62 100644 --- a/src/cloudflare/resources/load_balancers/monitors/monitors.py +++ b/src/cloudflare/resources/load_balancers/monitors/monitors.py @@ -43,13 +43,13 @@ make_request_options, ) from ....types.load_balancers import ( - Monitor, - MonitorDeleteResponse, monitor_edit_params, monitor_create_params, monitor_delete_params, monitor_update_params, ) +from ....types.load_balancers.monitor import Monitor +from ....types.load_balancers.monitor_delete_response import MonitorDeleteResponse __all__ = ["Monitors", "AsyncMonitors"] diff --git a/src/cloudflare/resources/load_balancers/monitors/previews.py b/src/cloudflare/resources/load_balancers/monitors/previews.py index 9e1b8be0a63..af33c0e44be 100644 --- a/src/cloudflare/resources/load_balancers/monitors/previews.py +++ b/src/cloudflare/resources/load_balancers/monitors/previews.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.load_balancers.monitors import PreviewCreateResponse, preview_create_params +from ....types.load_balancers.monitors import preview_create_params +from ....types.load_balancers.monitors.preview_create_response import PreviewCreateResponse __all__ = ["Previews", "AsyncPreviews"] diff --git a/src/cloudflare/resources/load_balancers/monitors/references.py b/src/cloudflare/resources/load_balancers/monitors/references.py index 66111135cfa..d45d7dec76a 100644 --- a/src/cloudflare/resources/load_balancers/monitors/references.py +++ b/src/cloudflare/resources/load_balancers/monitors/references.py @@ -19,7 +19,7 @@ from ...._base_client import ( make_request_options, ) -from ....types.load_balancers.monitors import ReferenceGetResponse +from ....types.load_balancers.monitors.reference_get_response import ReferenceGetResponse __all__ = ["References", "AsyncReferences"] diff --git a/src/cloudflare/resources/load_balancers/pools/health.py b/src/cloudflare/resources/load_balancers/pools/health.py index b39fbb4b385..0cab0069767 100644 --- a/src/cloudflare/resources/load_balancers/pools/health.py +++ b/src/cloudflare/resources/load_balancers/pools/health.py @@ -24,7 +24,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.load_balancers.pools import HealthGetResponse, HealthCreateResponse, health_create_params +from ....types.load_balancers.pools import health_create_params +from ....types.load_balancers.pools.health_get_response import HealthGetResponse +from ....types.load_balancers.pools.health_create_response import HealthCreateResponse __all__ = ["Health", "AsyncHealth"] diff --git a/src/cloudflare/resources/load_balancers/pools/pools.py b/src/cloudflare/resources/load_balancers/pools/pools.py index e588d365acf..b115d8e4d04 100644 --- a/src/cloudflare/resources/load_balancers/pools/pools.py +++ b/src/cloudflare/resources/load_balancers/pools/pools.py @@ -42,19 +42,19 @@ make_request_options, ) from ....types.load_balancers import ( - Pool, - CheckRegion, - OriginParam, - LoadSheddingParam, - PoolDeleteResponse, - OriginSteeringParam, - NotificationFilterParam, pool_edit_params, pool_list_params, pool_create_params, pool_delete_params, pool_update_params, ) +from ....types.load_balancers.pool import Pool +from ....types.load_balancers.check_region import CheckRegion +from ....types.load_balancers.origin_param import OriginParam +from ....types.load_balancers.load_shedding_param import LoadSheddingParam +from ....types.load_balancers.pool_delete_response import PoolDeleteResponse +from ....types.load_balancers.origin_steering_param import OriginSteeringParam +from ....types.load_balancers.notification_filter_param import NotificationFilterParam __all__ = ["Pools", "AsyncPools"] diff --git a/src/cloudflare/resources/load_balancers/pools/references.py b/src/cloudflare/resources/load_balancers/pools/references.py index 5a277f78306..69a5075ee53 100644 --- a/src/cloudflare/resources/load_balancers/pools/references.py +++ b/src/cloudflare/resources/load_balancers/pools/references.py @@ -19,7 +19,7 @@ from ...._base_client import ( make_request_options, ) -from ....types.load_balancers.pools import ReferenceGetResponse +from ....types.load_balancers.pools.reference_get_response import ReferenceGetResponse __all__ = ["References", "AsyncReferences"] diff --git a/src/cloudflare/resources/load_balancers/previews.py b/src/cloudflare/resources/load_balancers/previews.py index c4767c36f5e..b278228c134 100644 --- a/src/cloudflare/resources/load_balancers/previews.py +++ b/src/cloudflare/resources/load_balancers/previews.py @@ -19,7 +19,7 @@ from ..._base_client import ( make_request_options, ) -from ...types.load_balancers import PreviewGetResponse +from ...types.load_balancers.preview_get_response import PreviewGetResponse __all__ = ["Previews", "AsyncPreviews"] diff --git a/src/cloudflare/resources/load_balancers/regions.py b/src/cloudflare/resources/load_balancers/regions.py index 4a42202f9ef..ea3babea28c 100644 --- a/src/cloudflare/resources/load_balancers/regions.py +++ b/src/cloudflare/resources/load_balancers/regions.py @@ -24,7 +24,9 @@ from ..._base_client import ( make_request_options, ) -from ...types.load_balancers import RegionGetResponse, RegionListResponse, region_list_params +from ...types.load_balancers import region_list_params +from ...types.load_balancers.region_get_response import RegionGetResponse +from ...types.load_balancers.region_list_response import RegionListResponse __all__ = ["Regions", "AsyncRegions"] diff --git a/src/cloudflare/resources/load_balancers/searches.py b/src/cloudflare/resources/load_balancers/searches.py index 96c1a0624cb..8ac7a75a72c 100644 --- a/src/cloudflare/resources/load_balancers/searches.py +++ b/src/cloudflare/resources/load_balancers/searches.py @@ -23,7 +23,8 @@ from ..._base_client import ( make_request_options, ) -from ...types.load_balancers import SearchGetResponse, search_get_params +from ...types.load_balancers import search_get_params +from ...types.load_balancers.search_get_response import SearchGetResponse __all__ = ["Searches", "AsyncSearches"] diff --git a/src/cloudflare/resources/logpush/datasets/jobs.py b/src/cloudflare/resources/logpush/datasets/jobs.py index df4cc9a4d2d..73c5db30eca 100644 --- a/src/cloudflare/resources/logpush/datasets/jobs.py +++ b/src/cloudflare/resources/logpush/datasets/jobs.py @@ -19,7 +19,7 @@ from ...._base_client import ( make_request_options, ) -from ....types.logpush.datasets import JobGetResponse +from ....types.logpush.datasets.job_get_response import JobGetResponse __all__ = ["Jobs", "AsyncJobs"] diff --git a/src/cloudflare/resources/logpush/edge.py b/src/cloudflare/resources/logpush/edge.py index 9c72a01a04c..515633d4f31 100644 --- a/src/cloudflare/resources/logpush/edge.py +++ b/src/cloudflare/resources/logpush/edge.py @@ -23,7 +23,9 @@ from ..._base_client import ( make_request_options, ) -from ...types.logpush import EdgeGetResponse, InstantLogpushJob, edge_create_params +from ...types.logpush import edge_create_params +from ...types.logpush.edge_get_response import EdgeGetResponse +from ...types.logpush.instant_logpush_job import InstantLogpushJob __all__ = ["Edge", "AsyncEdge"] diff --git a/src/cloudflare/resources/logpush/jobs.py b/src/cloudflare/resources/logpush/jobs.py index e234f452e67..e87f6e7d193 100644 --- a/src/cloudflare/resources/logpush/jobs.py +++ b/src/cloudflare/resources/logpush/jobs.py @@ -26,13 +26,9 @@ AsyncPaginator, make_request_options, ) -from ...types.logpush import ( - LogpushJob, - OutputOptionsParam, - job_create_params, - job_delete_params, - job_update_params, -) +from ...types.logpush import job_create_params, job_delete_params, job_update_params +from ...types.logpush.logpush_job import LogpushJob +from ...types.logpush.output_options_param import OutputOptionsParam __all__ = ["Jobs", "AsyncJobs"] diff --git a/src/cloudflare/resources/logpush/ownership.py b/src/cloudflare/resources/logpush/ownership.py index 4a8c73f206f..fb108a5d69e 100644 --- a/src/cloudflare/resources/logpush/ownership.py +++ b/src/cloudflare/resources/logpush/ownership.py @@ -23,12 +23,9 @@ from ..._base_client import ( make_request_options, ) -from ...types.logpush import ( - OwnershipValidation, - OwnershipCreateResponse, - ownership_create_params, - ownership_validate_params, -) +from ...types.logpush import ownership_create_params, ownership_validate_params +from ...types.logpush.ownership_validation import OwnershipValidation +from ...types.logpush.ownership_create_response import OwnershipCreateResponse __all__ = ["Ownership", "AsyncOwnership"] diff --git a/src/cloudflare/resources/logpush/validate.py b/src/cloudflare/resources/logpush/validate.py index c57845880cd..63f1e319a49 100644 --- a/src/cloudflare/resources/logpush/validate.py +++ b/src/cloudflare/resources/logpush/validate.py @@ -23,12 +23,9 @@ from ..._base_client import ( make_request_options, ) -from ...types.logpush import ( - ValidateOriginResponse, - ValidateDestinationResponse, - validate_origin_params, - validate_destination_params, -) +from ...types.logpush import validate_origin_params, validate_destination_params +from ...types.logpush.validate_origin_response import ValidateOriginResponse +from ...types.logpush.validate_destination_response import ValidateDestinationResponse __all__ = ["Validate", "AsyncValidate"] diff --git a/src/cloudflare/resources/logs/control/cmb/config.py b/src/cloudflare/resources/logs/control/cmb/config.py index 98f522b36b9..751d3e17108 100644 --- a/src/cloudflare/resources/logs/control/cmb/config.py +++ b/src/cloudflare/resources/logs/control/cmb/config.py @@ -23,7 +23,8 @@ from ....._base_client import ( make_request_options, ) -from .....types.logs.control.cmb import CmbConfig, config_create_params, config_delete_params +from .....types.logs.control.cmb import config_create_params, config_delete_params +from .....types.logs.control.cmb.cmb_config import CmbConfig __all__ = ["Config", "AsyncConfig"] diff --git a/src/cloudflare/resources/logs/control/retention/flag.py b/src/cloudflare/resources/logs/control/retention/flag.py index 6e2ec7236b2..5c450fbdebd 100644 --- a/src/cloudflare/resources/logs/control/retention/flag.py +++ b/src/cloudflare/resources/logs/control/retention/flag.py @@ -23,7 +23,9 @@ from ....._base_client import ( make_request_options, ) -from .....types.logs.control.retention import FlagGetResponse, FlagCreateResponse, flag_create_params +from .....types.logs.control.retention import flag_create_params +from .....types.logs.control.retention.flag_get_response import FlagGetResponse +from .....types.logs.control.retention.flag_create_response import FlagCreateResponse __all__ = ["Flag", "AsyncFlag"] diff --git a/src/cloudflare/resources/logs/rayid.py b/src/cloudflare/resources/logs/rayid.py index 7b21e5fb1bc..b8cbcec6523 100644 --- a/src/cloudflare/resources/logs/rayid.py +++ b/src/cloudflare/resources/logs/rayid.py @@ -20,10 +20,11 @@ async_to_raw_response_wrapper, async_to_streamed_response_wrapper, ) -from ...types.logs import RayIDGetResponse, rayid_get_params +from ...types.logs import rayid_get_params from ..._base_client import ( make_request_options, ) +from ...types.logs.rayid_get_response import RayIDGetResponse __all__ = ["RayID", "AsyncRayID"] diff --git a/src/cloudflare/resources/logs/received/fields.py b/src/cloudflare/resources/logs/received/fields.py index ca480194be1..5499b8de87d 100644 --- a/src/cloudflare/resources/logs/received/fields.py +++ b/src/cloudflare/resources/logs/received/fields.py @@ -16,7 +16,7 @@ from ...._base_client import ( make_request_options, ) -from ....types.logs.received import FieldGetResponse +from ....types.logs.received.field_get_response import FieldGetResponse __all__ = ["Fields", "AsyncFields"] diff --git a/src/cloudflare/resources/logs/received/received.py b/src/cloudflare/resources/logs/received/received.py index ffc41c0d3c6..23a87d03923 100644 --- a/src/cloudflare/resources/logs/received/received.py +++ b/src/cloudflare/resources/logs/received/received.py @@ -28,10 +28,11 @@ async_to_raw_response_wrapper, async_to_streamed_response_wrapper, ) -from ....types.logs import ReceivedGetResponse, received_get_params +from ....types.logs import received_get_params from ...._base_client import ( make_request_options, ) +from ....types.logs.received_get_response import ReceivedGetResponse __all__ = ["Received", "AsyncReceived"] diff --git a/src/cloudflare/resources/magic_network_monitoring/configs/configs.py b/src/cloudflare/resources/magic_network_monitoring/configs/configs.py index 67082f93470..f269d3bf7cc 100644 --- a/src/cloudflare/resources/magic_network_monitoring/configs/configs.py +++ b/src/cloudflare/resources/magic_network_monitoring/configs/configs.py @@ -32,12 +32,12 @@ make_request_options, ) from ....types.magic_network_monitoring import ( - Configuration, config_edit_params, config_create_params, config_delete_params, config_update_params, ) +from ....types.magic_network_monitoring.configuration import Configuration __all__ = ["Configs", "AsyncConfigs"] diff --git a/src/cloudflare/resources/magic_network_monitoring/configs/full.py b/src/cloudflare/resources/magic_network_monitoring/configs/full.py index 122e1108b1f..96160ed83a6 100644 --- a/src/cloudflare/resources/magic_network_monitoring/configs/full.py +++ b/src/cloudflare/resources/magic_network_monitoring/configs/full.py @@ -19,7 +19,7 @@ from ...._base_client import ( make_request_options, ) -from ....types.magic_network_monitoring import Configuration +from ....types.magic_network_monitoring.configuration import Configuration __all__ = ["Full", "AsyncFull"] diff --git a/src/cloudflare/resources/magic_network_monitoring/rules/advertisements.py b/src/cloudflare/resources/magic_network_monitoring/rules/advertisements.py index 2d0fbf78310..cc59607afb7 100644 --- a/src/cloudflare/resources/magic_network_monitoring/rules/advertisements.py +++ b/src/cloudflare/resources/magic_network_monitoring/rules/advertisements.py @@ -23,7 +23,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.magic_network_monitoring.rules import Advertisement, advertisement_edit_params +from ....types.magic_network_monitoring.rules import advertisement_edit_params +from ....types.magic_network_monitoring.rules.advertisement import Advertisement __all__ = ["Advertisements", "AsyncAdvertisements"] diff --git a/src/cloudflare/resources/magic_network_monitoring/rules/rules.py b/src/cloudflare/resources/magic_network_monitoring/rules/rules.py index 31f0a3471fb..c4c1400ee4a 100644 --- a/src/cloudflare/resources/magic_network_monitoring/rules/rules.py +++ b/src/cloudflare/resources/magic_network_monitoring/rules/rules.py @@ -34,12 +34,12 @@ make_request_options, ) from ....types.magic_network_monitoring import ( - MagicNetworkMonitoringRule, rule_edit_params, rule_create_params, rule_delete_params, rule_update_params, ) +from ....types.magic_network_monitoring.magic_network_monitoring_rule import MagicNetworkMonitoringRule __all__ = ["Rules", "AsyncRules"] diff --git a/src/cloudflare/resources/magic_transit/cf_interconnects.py b/src/cloudflare/resources/magic_transit/cf_interconnects.py index f60280da10c..2169477e5c3 100644 --- a/src/cloudflare/resources/magic_transit/cf_interconnects.py +++ b/src/cloudflare/resources/magic_transit/cf_interconnects.py @@ -23,12 +23,10 @@ from ..._base_client import ( make_request_options, ) -from ...types.magic_transit import ( - CfInterconnectGetResponse, - CfInterconnectListResponse, - CfInterconnectUpdateResponse, - cf_interconnect_update_params, -) +from ...types.magic_transit import cf_interconnect_update_params +from ...types.magic_transit.cf_interconnect_get_response import CfInterconnectGetResponse +from ...types.magic_transit.cf_interconnect_list_response import CfInterconnectListResponse +from ...types.magic_transit.cf_interconnect_update_response import CfInterconnectUpdateResponse __all__ = ["CfInterconnects", "AsyncCfInterconnects"] diff --git a/src/cloudflare/resources/magic_transit/gre_tunnels.py b/src/cloudflare/resources/magic_transit/gre_tunnels.py index 89f6699f45d..2c652156496 100644 --- a/src/cloudflare/resources/magic_transit/gre_tunnels.py +++ b/src/cloudflare/resources/magic_transit/gre_tunnels.py @@ -24,16 +24,16 @@ make_request_options, ) from ...types.magic_transit import ( - HealthCheckParam, - GRETunnelGetResponse, - GRETunnelListResponse, - GRETunnelCreateResponse, - GRETunnelDeleteResponse, - GRETunnelUpdateResponse, gre_tunnel_create_params, gre_tunnel_delete_params, gre_tunnel_update_params, ) +from ...types.magic_transit.health_check_param import HealthCheckParam +from ...types.magic_transit.gre_tunnel_get_response import GRETunnelGetResponse +from ...types.magic_transit.gre_tunnel_list_response import GRETunnelListResponse +from ...types.magic_transit.gre_tunnel_create_response import GRETunnelCreateResponse +from ...types.magic_transit.gre_tunnel_delete_response import GRETunnelDeleteResponse +from ...types.magic_transit.gre_tunnel_update_response import GRETunnelUpdateResponse __all__ = ["GRETunnels", "AsyncGRETunnels"] diff --git a/src/cloudflare/resources/magic_transit/ipsec_tunnels.py b/src/cloudflare/resources/magic_transit/ipsec_tunnels.py index 456550c7f3c..2e784ac0ec8 100644 --- a/src/cloudflare/resources/magic_transit/ipsec_tunnels.py +++ b/src/cloudflare/resources/magic_transit/ipsec_tunnels.py @@ -24,18 +24,18 @@ make_request_options, ) from ...types.magic_transit import ( - HealthCheckParam, - IPSECTunnelGetResponse, - IPSECTunnelListResponse, - IPSECTunnelCreateResponse, - IPSECTunnelDeleteResponse, - IPSECTunnelUpdateResponse, - IPSECTunnelPSKGenerateResponse, ipsec_tunnel_create_params, ipsec_tunnel_delete_params, ipsec_tunnel_update_params, ipsec_tunnel_psk_generate_params, ) +from ...types.magic_transit.health_check_param import HealthCheckParam +from ...types.magic_transit.ipsec_tunnel_get_response import IPSECTunnelGetResponse +from ...types.magic_transit.ipsec_tunnel_list_response import IPSECTunnelListResponse +from ...types.magic_transit.ipsec_tunnel_create_response import IPSECTunnelCreateResponse +from ...types.magic_transit.ipsec_tunnel_delete_response import IPSECTunnelDeleteResponse +from ...types.magic_transit.ipsec_tunnel_update_response import IPSECTunnelUpdateResponse +from ...types.magic_transit.ipsec_tunnel_psk_generate_response import IPSECTunnelPSKGenerateResponse __all__ = ["IPSECTunnels", "AsyncIPSECTunnels"] diff --git a/src/cloudflare/resources/magic_transit/routes.py b/src/cloudflare/resources/magic_transit/routes.py index b9dd1e25586..a1348dfa7fa 100644 --- a/src/cloudflare/resources/magic_transit/routes.py +++ b/src/cloudflare/resources/magic_transit/routes.py @@ -24,18 +24,18 @@ make_request_options, ) from ...types.magic_transit import ( - ScopeParam, - RouteGetResponse, - RouteListResponse, - RouteEmptyResponse, - RouteCreateResponse, - RouteDeleteResponse, - RouteUpdateResponse, route_empty_params, route_create_params, route_delete_params, route_update_params, ) +from ...types.magic_transit.scope_param import ScopeParam +from ...types.magic_transit.route_get_response import RouteGetResponse +from ...types.magic_transit.route_list_response import RouteListResponse +from ...types.magic_transit.route_empty_response import RouteEmptyResponse +from ...types.magic_transit.route_create_response import RouteCreateResponse +from ...types.magic_transit.route_delete_response import RouteDeleteResponse +from ...types.magic_transit.route_update_response import RouteUpdateResponse __all__ = ["Routes", "AsyncRoutes"] diff --git a/src/cloudflare/resources/magic_transit/sites/acls.py b/src/cloudflare/resources/magic_transit/sites/acls.py index 3f52cf167b7..b403d40962e 100644 --- a/src/cloudflare/resources/magic_transit/sites/acls.py +++ b/src/cloudflare/resources/magic_transit/sites/acls.py @@ -25,14 +25,10 @@ AsyncPaginator, make_request_options, ) -from ....types.magic_transit.sites import ( - ACL, - AllowedProtocol, - ACLConfigurationParam, - acl_create_params, - acl_delete_params, - acl_update_params, -) +from ....types.magic_transit.sites import acl_create_params, acl_delete_params, acl_update_params +from ....types.magic_transit.sites.acl import ACL +from ....types.magic_transit.sites.allowed_protocol import AllowedProtocol +from ....types.magic_transit.sites.acl_configuration_param import ACLConfigurationParam __all__ = ["ACLs", "AsyncACLs"] diff --git a/src/cloudflare/resources/magic_transit/sites/lans.py b/src/cloudflare/resources/magic_transit/sites/lans.py index ddf4c5c9ced..12412367514 100644 --- a/src/cloudflare/resources/magic_transit/sites/lans.py +++ b/src/cloudflare/resources/magic_transit/sites/lans.py @@ -26,15 +26,15 @@ make_request_options, ) from ....types.magic_transit.sites import ( - LAN, - NatParam, - LANCreateResponse, - RoutedSubnetParam, - LANStaticAddressingParam, lan_create_params, lan_delete_params, lan_update_params, ) +from ....types.magic_transit.sites.lan import LAN +from ....types.magic_transit.sites.nat_param import NatParam +from ....types.magic_transit.sites.lan_create_response import LANCreateResponse +from ....types.magic_transit.sites.routed_subnet_param import RoutedSubnetParam +from ....types.magic_transit.sites.lan_static_addressing_param import LANStaticAddressingParam __all__ = ["LANs", "AsyncLANs"] diff --git a/src/cloudflare/resources/magic_transit/sites/sites.py b/src/cloudflare/resources/magic_transit/sites/sites.py index dd5e94179bb..8a585c53e65 100644 --- a/src/cloudflare/resources/magic_transit/sites/sites.py +++ b/src/cloudflare/resources/magic_transit/sites/sites.py @@ -50,13 +50,13 @@ make_request_options, ) from ....types.magic_transit import ( - Site, - SiteLocationParam, site_list_params, site_create_params, site_delete_params, site_update_params, ) +from ....types.magic_transit.site import Site +from ....types.magic_transit.site_location_param import SiteLocationParam __all__ = ["Sites", "AsyncSites"] diff --git a/src/cloudflare/resources/magic_transit/sites/wans.py b/src/cloudflare/resources/magic_transit/sites/wans.py index 1bcf19c8094..023cd6afced 100644 --- a/src/cloudflare/resources/magic_transit/sites/wans.py +++ b/src/cloudflare/resources/magic_transit/sites/wans.py @@ -25,14 +25,10 @@ AsyncPaginator, make_request_options, ) -from ....types.magic_transit.sites import ( - WAN, - WANCreateResponse, - WANStaticAddressingParam, - wan_create_params, - wan_delete_params, - wan_update_params, -) +from ....types.magic_transit.sites import wan_create_params, wan_delete_params, wan_update_params +from ....types.magic_transit.sites.wan import WAN +from ....types.magic_transit.sites.wan_create_response import WANCreateResponse +from ....types.magic_transit.sites.wan_static_addressing_param import WANStaticAddressingParam __all__ = ["WANs", "AsyncWANs"] diff --git a/src/cloudflare/resources/managed_headers.py b/src/cloudflare/resources/managed_headers.py index 611d90a6535..dd3f4803ae2 100644 --- a/src/cloudflare/resources/managed_headers.py +++ b/src/cloudflare/resources/managed_headers.py @@ -22,12 +22,10 @@ from .._base_client import ( make_request_options, ) -from ..types.managed_headers import ( - RequestModelParam, - ManagedHeaderEditResponse, - ManagedHeaderListResponse, - managed_header_edit_params, -) +from ..types.managed_headers import managed_header_edit_params +from ..types.managed_headers.request_model_param import RequestModelParam +from ..types.managed_headers.managed_header_edit_response import ManagedHeaderEditResponse +from ..types.managed_headers.managed_header_list_response import ManagedHeaderListResponse __all__ = ["ManagedHeaders", "AsyncManagedHeaders"] diff --git a/src/cloudflare/resources/memberships.py b/src/cloudflare/resources/memberships.py index ab7b71ea791..90fe5a2cd56 100644 --- a/src/cloudflare/resources/memberships.py +++ b/src/cloudflare/resources/memberships.py @@ -26,15 +26,11 @@ AsyncPaginator, make_request_options, ) -from ..types.memberships import ( - Membership, - MembershipGetResponse, - MembershipDeleteResponse, - MembershipUpdateResponse, - membership_list_params, - membership_delete_params, - membership_update_params, -) +from ..types.memberships import membership_list_params, membership_delete_params, membership_update_params +from ..types.memberships.membership import Membership +from ..types.memberships.membership_get_response import MembershipGetResponse +from ..types.memberships.membership_delete_response import MembershipDeleteResponse +from ..types.memberships.membership_update_response import MembershipUpdateResponse __all__ = ["Memberships", "AsyncMemberships"] diff --git a/src/cloudflare/resources/mtls_certificates/associations.py b/src/cloudflare/resources/mtls_certificates/associations.py index 935cdea4a3d..0fc419285c6 100644 --- a/src/cloudflare/resources/mtls_certificates/associations.py +++ b/src/cloudflare/resources/mtls_certificates/associations.py @@ -19,7 +19,7 @@ from ..._base_client import ( make_request_options, ) -from ...types.mtls_certificates import AssociationGetResponse +from ...types.mtls_certificates.association_get_response import AssociationGetResponse __all__ = ["Associations", "AsyncAssociations"] diff --git a/src/cloudflare/resources/mtls_certificates/mtls_certificates.py b/src/cloudflare/resources/mtls_certificates/mtls_certificates.py index 41e84024209..4eaca16dc88 100644 --- a/src/cloudflare/resources/mtls_certificates/mtls_certificates.py +++ b/src/cloudflare/resources/mtls_certificates/mtls_certificates.py @@ -33,12 +33,9 @@ AsyncPaginator, make_request_options, ) -from ...types.mtls_certificates import ( - MTLSCertificate, - MTLSCertificateCreateResponse, - mtls_certificate_create_params, - mtls_certificate_delete_params, -) +from ...types.mtls_certificates import mtls_certificate_create_params, mtls_certificate_delete_params +from ...types.mtls_certificates.mtls_certificate import MTLSCertificate +from ...types.mtls_certificates.mtls_certificate_create_response import MTLSCertificateCreateResponse __all__ = ["MTLSCertificates", "AsyncMTLSCertificates"] diff --git a/src/cloudflare/resources/origin_ca_certificates.py b/src/cloudflare/resources/origin_ca_certificates.py index ad1379cad32..7904201c477 100644 --- a/src/cloudflare/resources/origin_ca_certificates.py +++ b/src/cloudflare/resources/origin_ca_certificates.py @@ -27,14 +27,14 @@ make_request_options, ) from ..types.origin_ca_certificates import ( - OriginCACertificate, - OriginCACertificateGetResponse, - OriginCACertificateCreateResponse, - OriginCACertificateDeleteResponse, origin_ca_certificate_list_params, origin_ca_certificate_create_params, origin_ca_certificate_delete_params, ) +from ..types.origin_ca_certificates.origin_ca_certificate import OriginCACertificate +from ..types.origin_ca_certificates.origin_ca_certificate_get_response import OriginCACertificateGetResponse +from ..types.origin_ca_certificates.origin_ca_certificate_create_response import OriginCACertificateCreateResponse +from ..types.origin_ca_certificates.origin_ca_certificate_delete_response import OriginCACertificateDeleteResponse __all__ = ["OriginCACertificates", "AsyncOriginCACertificates"] diff --git a/src/cloudflare/resources/origin_post_quantum_encryption.py b/src/cloudflare/resources/origin_post_quantum_encryption.py index 51f0923f448..7eff4f47771 100644 --- a/src/cloudflare/resources/origin_post_quantum_encryption.py +++ b/src/cloudflare/resources/origin_post_quantum_encryption.py @@ -24,10 +24,12 @@ from .._base_client import ( make_request_options, ) -from ..types.origin_post_quantum_encryption import ( +from ..types.origin_post_quantum_encryption import origin_post_quantum_encryption_update_params +from ..types.origin_post_quantum_encryption.origin_post_quantum_encryption_get_response import ( OriginPostQuantumEncryptionGetResponse, +) +from ..types.origin_post_quantum_encryption.origin_post_quantum_encryption_update_response import ( OriginPostQuantumEncryptionUpdateResponse, - origin_post_quantum_encryption_update_params, ) __all__ = ["OriginPostQuantumEncryption", "AsyncOriginPostQuantumEncryption"] diff --git a/src/cloudflare/resources/origin_tls_client_auth/hostnames/certificates.py b/src/cloudflare/resources/origin_tls_client_auth/hostnames/certificates.py index c62e636d988..3d78187e7ae 100644 --- a/src/cloudflare/resources/origin_tls_client_auth/hostnames/certificates.py +++ b/src/cloudflare/resources/origin_tls_client_auth/hostnames/certificates.py @@ -25,14 +25,11 @@ AsyncPaginator, make_request_options, ) -from ....types.origin_tls_client_auth import AuthenticatedOriginPull -from ....types.origin_tls_client_auth.hostnames import ( - CertificateGetResponse, - CertificateCreateResponse, - CertificateDeleteResponse, - certificate_create_params, - certificate_delete_params, -) +from ....types.origin_tls_client_auth.hostnames import certificate_create_params, certificate_delete_params +from ....types.origin_tls_client_auth.authenticated_origin_pull import AuthenticatedOriginPull +from ....types.origin_tls_client_auth.hostnames.certificate_get_response import CertificateGetResponse +from ....types.origin_tls_client_auth.hostnames.certificate_create_response import CertificateCreateResponse +from ....types.origin_tls_client_auth.hostnames.certificate_delete_response import CertificateDeleteResponse __all__ = ["Certificates", "AsyncCertificates"] diff --git a/src/cloudflare/resources/origin_tls_client_auth/hostnames/hostnames.py b/src/cloudflare/resources/origin_tls_client_auth/hostnames/hostnames.py index 0d45e3f9590..c8232a17f15 100644 --- a/src/cloudflare/resources/origin_tls_client_auth/hostnames/hostnames.py +++ b/src/cloudflare/resources/origin_tls_client_auth/hostnames/hostnames.py @@ -31,7 +31,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.origin_tls_client_auth import HostnameUpdateResponse, AuthenticatedOriginPull, hostname_update_params +from ....types.origin_tls_client_auth import hostname_update_params +from ....types.origin_tls_client_auth.hostname_update_response import HostnameUpdateResponse +from ....types.origin_tls_client_auth.authenticated_origin_pull import AuthenticatedOriginPull __all__ = ["Hostnames", "AsyncHostnames"] diff --git a/src/cloudflare/resources/origin_tls_client_auth/origin_tls_client_auth.py b/src/cloudflare/resources/origin_tls_client_auth/origin_tls_client_auth.py index 440469aa888..4292528967b 100644 --- a/src/cloudflare/resources/origin_tls_client_auth/origin_tls_client_auth.py +++ b/src/cloudflare/resources/origin_tls_client_auth/origin_tls_client_auth.py @@ -42,14 +42,11 @@ make_request_options, ) from .hostnames.hostnames import Hostnames, AsyncHostnames -from ...types.origin_tls_client_auth import ( - ZoneAuthenticatedOriginPull, - OriginTLSClientAuthGetResponse, - OriginTLSClientAuthCreateResponse, - OriginTLSClientAuthDeleteResponse, - origin_tls_client_auth_create_params, - origin_tls_client_auth_delete_params, -) +from ...types.origin_tls_client_auth import origin_tls_client_auth_create_params, origin_tls_client_auth_delete_params +from ...types.origin_tls_client_auth.zone_authenticated_origin_pull import ZoneAuthenticatedOriginPull +from ...types.origin_tls_client_auth.origin_tls_client_auth_get_response import OriginTLSClientAuthGetResponse +from ...types.origin_tls_client_auth.origin_tls_client_auth_create_response import OriginTLSClientAuthCreateResponse +from ...types.origin_tls_client_auth.origin_tls_client_auth_delete_response import OriginTLSClientAuthDeleteResponse __all__ = ["OriginTLSClientAuth", "AsyncOriginTLSClientAuth"] diff --git a/src/cloudflare/resources/origin_tls_client_auth/settings.py b/src/cloudflare/resources/origin_tls_client_auth/settings.py index b215f6b479b..2dcf34d4994 100644 --- a/src/cloudflare/resources/origin_tls_client_auth/settings.py +++ b/src/cloudflare/resources/origin_tls_client_auth/settings.py @@ -23,7 +23,9 @@ from ..._base_client import ( make_request_options, ) -from ...types.origin_tls_client_auth import SettingGetResponse, SettingUpdateResponse, setting_update_params +from ...types.origin_tls_client_auth import setting_update_params +from ...types.origin_tls_client_auth.setting_get_response import SettingGetResponse +from ...types.origin_tls_client_auth.setting_update_response import SettingUpdateResponse __all__ = ["Settings", "AsyncSettings"] diff --git a/src/cloudflare/resources/page_shield/connections.py b/src/cloudflare/resources/page_shield/connections.py index be851a093f7..a4247e2e63e 100644 --- a/src/cloudflare/resources/page_shield/connections.py +++ b/src/cloudflare/resources/page_shield/connections.py @@ -21,7 +21,8 @@ AsyncPaginator, make_request_options, ) -from ...types.page_shield import Connection, connection_list_params +from ...types.page_shield import connection_list_params +from ...types.page_shield.connection import Connection __all__ = ["Connections", "AsyncConnections"] diff --git a/src/cloudflare/resources/page_shield/page_shield.py b/src/cloudflare/resources/page_shield/page_shield.py index 2c04d6b0ca7..c85989a6974 100644 --- a/src/cloudflare/resources/page_shield/page_shield.py +++ b/src/cloudflare/resources/page_shield/page_shield.py @@ -47,7 +47,9 @@ from ..._base_client import ( make_request_options, ) -from ...types.page_shield import Setting, PageShieldUpdateResponse, page_shield_update_params +from ...types.page_shield import page_shield_update_params +from ...types.page_shield.setting import Setting +from ...types.page_shield.page_shield_update_response import PageShieldUpdateResponse __all__ = ["PageShield", "AsyncPageShield"] diff --git a/src/cloudflare/resources/page_shield/policies.py b/src/cloudflare/resources/page_shield/policies.py index adea1b1a818..bf39a763175 100644 --- a/src/cloudflare/resources/page_shield/policies.py +++ b/src/cloudflare/resources/page_shield/policies.py @@ -24,7 +24,8 @@ AsyncPaginator, make_request_options, ) -from ...types.page_shield import Policy, policy_create_params, policy_update_params +from ...types.page_shield import policy_create_params, policy_update_params +from ...types.page_shield.policy import Policy __all__ = ["Policies", "AsyncPolicies"] diff --git a/src/cloudflare/resources/page_shield/scripts.py b/src/cloudflare/resources/page_shield/scripts.py index da125df7dce..eeb2fc4e38e 100644 --- a/src/cloudflare/resources/page_shield/scripts.py +++ b/src/cloudflare/resources/page_shield/scripts.py @@ -21,7 +21,9 @@ AsyncPaginator, make_request_options, ) -from ...types.page_shield import Script, ScriptGetResponse, script_list_params +from ...types.page_shield import script_list_params +from ...types.page_shield.script import Script +from ...types.page_shield.script_get_response import ScriptGetResponse __all__ = ["Scripts", "AsyncScripts"] diff --git a/src/cloudflare/resources/pagerules/pagerules.py b/src/cloudflare/resources/pagerules/pagerules.py index 29ec83cb76c..d21e3711a07 100644 --- a/src/cloudflare/resources/pagerules/pagerules.py +++ b/src/cloudflare/resources/pagerules/pagerules.py @@ -33,20 +33,20 @@ make_request_options, ) from ...types.pagerules import ( - RouteParam, - TargetParam, - PageruleGetResponse, - PageruleEditResponse, - PageruleListResponse, - PageruleCreateResponse, - PageruleDeleteResponse, - PageruleUpdateResponse, pagerule_edit_params, pagerule_list_params, pagerule_create_params, pagerule_delete_params, pagerule_update_params, ) +from ...types.pagerules.route_param import RouteParam +from ...types.pagerules.target_param import TargetParam +from ...types.pagerules.pagerule_get_response import PageruleGetResponse +from ...types.pagerules.pagerule_edit_response import PageruleEditResponse +from ...types.pagerules.pagerule_list_response import PageruleListResponse +from ...types.pagerules.pagerule_create_response import PageruleCreateResponse +from ...types.pagerules.pagerule_delete_response import PageruleDeleteResponse +from ...types.pagerules.pagerule_update_response import PageruleUpdateResponse __all__ = ["Pagerules", "AsyncPagerules"] diff --git a/src/cloudflare/resources/pagerules/settings.py b/src/cloudflare/resources/pagerules/settings.py index 6981b9f6166..bb73d14ab15 100644 --- a/src/cloudflare/resources/pagerules/settings.py +++ b/src/cloudflare/resources/pagerules/settings.py @@ -19,7 +19,7 @@ from ..._base_client import ( make_request_options, ) -from ...types.pagerules import SettingListResponse +from ...types.pagerules.setting_list_response import SettingListResponse __all__ = ["Settings", "AsyncSettings"] diff --git a/src/cloudflare/resources/pages/projects/deployments/deployments.py b/src/cloudflare/resources/pages/projects/deployments/deployments.py index c3c3d1314c0..cb8abe757c7 100644 --- a/src/cloudflare/resources/pages/projects/deployments/deployments.py +++ b/src/cloudflare/resources/pages/projects/deployments/deployments.py @@ -30,7 +30,6 @@ ) from ....._wrappers import ResultWrapper from .....pagination import SyncSinglePage, AsyncSinglePage -from .....types.pages import Deployment from .history.history import History, AsyncHistory from ....._base_client import ( AsyncPaginator, @@ -43,6 +42,7 @@ deployment_delete_params, deployment_rollback_params, ) +from .....types.pages.deployment import Deployment __all__ = ["Deployments", "AsyncDeployments"] diff --git a/src/cloudflare/resources/pages/projects/deployments/history/logs.py b/src/cloudflare/resources/pages/projects/deployments/history/logs.py index 7be7379e0e0..1d6d85bca2f 100644 --- a/src/cloudflare/resources/pages/projects/deployments/history/logs.py +++ b/src/cloudflare/resources/pages/projects/deployments/history/logs.py @@ -19,7 +19,7 @@ from ......_base_client import ( make_request_options, ) -from ......types.pages.projects.deployments.history import LogGetResponse +from ......types.pages.projects.deployments.history.log_get_response import LogGetResponse __all__ = ["Logs", "AsyncLogs"] diff --git a/src/cloudflare/resources/pages/projects/domains.py b/src/cloudflare/resources/pages/projects/domains.py index 99c252b7744..8fe842362dd 100644 --- a/src/cloudflare/resources/pages/projects/domains.py +++ b/src/cloudflare/resources/pages/projects/domains.py @@ -25,14 +25,10 @@ AsyncPaginator, make_request_options, ) -from ....types.pages.projects import ( - DomainGetResponse, - DomainEditResponse, - DomainCreateResponse, - domain_edit_params, - domain_create_params, - domain_delete_params, -) +from ....types.pages.projects import domain_edit_params, domain_create_params, domain_delete_params +from ....types.pages.projects.domain_get_response import DomainGetResponse +from ....types.pages.projects.domain_edit_response import DomainEditResponse +from ....types.pages.projects.domain_create_response import DomainCreateResponse __all__ = ["Domains", "AsyncDomains"] diff --git a/src/cloudflare/resources/pages/projects/projects.py b/src/cloudflare/resources/pages/projects/projects.py index 8bd1aaa76f6..4382f8220a4 100644 --- a/src/cloudflare/resources/pages/projects/projects.py +++ b/src/cloudflare/resources/pages/projects/projects.py @@ -37,21 +37,17 @@ ) from ...._wrappers import ResultWrapper from ....pagination import SyncSinglePage, AsyncSinglePage -from ....types.pages import ( - Project, - Deployment, - DeploymentParam, - ProjectEditResponse, - ProjectCreateResponse, - project_edit_params, - project_create_params, - project_delete_params, -) +from ....types.pages import Deployment, project_edit_params, project_create_params, project_delete_params from ...._base_client import ( AsyncPaginator, make_request_options, ) +from ....types.pages.project import Project from .deployments.deployments import Deployments, AsyncDeployments +from ....types.pages.deployment import Deployment +from ....types.pages.deployment_param import DeploymentParam +from ....types.pages.project_edit_response import ProjectEditResponse +from ....types.pages.project_create_response import ProjectCreateResponse __all__ = ["Projects", "AsyncProjects"] diff --git a/src/cloudflare/resources/pcaps/ownership.py b/src/cloudflare/resources/pcaps/ownership.py index 435497c3fe9..618d9796ddd 100644 --- a/src/cloudflare/resources/pcaps/ownership.py +++ b/src/cloudflare/resources/pcaps/ownership.py @@ -20,10 +20,12 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.pcaps import Ownership, OwnershipGetResponse, ownership_create_params, ownership_validate_params +from ...types.pcaps import ownership_create_params, ownership_validate_params from ..._base_client import ( make_request_options, ) +from ...types.pcaps.ownership import Ownership +from ...types.pcaps.ownership_get_response import OwnershipGetResponse __all__ = ["OwnershipResource", "AsyncOwnershipResource"] diff --git a/src/cloudflare/resources/pcaps/pcaps.py b/src/cloudflare/resources/pcaps/pcaps.py index 64c0a0e7253..d0a955ceada 100644 --- a/src/cloudflare/resources/pcaps/pcaps.py +++ b/src/cloudflare/resources/pcaps/pcaps.py @@ -39,17 +39,15 @@ ) from ..._wrappers import ResultWrapper from ...pagination import SyncSinglePage, AsyncSinglePage -from ...types.pcaps import ( - PCAPFilterParam, - PCAPGetResponse, - PCAPListResponse, - PCAPCreateResponse, - pcap_create_params, -) +from ...types.pcaps import pcap_create_params from ..._base_client import ( AsyncPaginator, make_request_options, ) +from ...types.pcaps.pcap_filter_param import PCAPFilterParam +from ...types.pcaps.pcap_get_response import PCAPGetResponse +from ...types.pcaps.pcap_list_response import PCAPListResponse +from ...types.pcaps.pcap_create_response import PCAPCreateResponse __all__ = ["PCAPs", "AsyncPCAPs"] diff --git a/src/cloudflare/resources/plans.py b/src/cloudflare/resources/plans.py index 8e1dcf6f0bb..65a96c4dc19 100644 --- a/src/cloudflare/resources/plans.py +++ b/src/cloudflare/resources/plans.py @@ -17,11 +17,11 @@ ) from .._wrappers import ResultWrapper from ..pagination import SyncSinglePage, AsyncSinglePage -from ..types.plans import AvailableRatePlan from .._base_client import ( AsyncPaginator, make_request_options, ) +from ..types.plans.available_rate_plan import AvailableRatePlan __all__ = ["Plans", "AsyncPlans"] diff --git a/src/cloudflare/resources/queues/consumers.py b/src/cloudflare/resources/queues/consumers.py index 6af8566832b..0ac6112211a 100644 --- a/src/cloudflare/resources/queues/consumers.py +++ b/src/cloudflare/resources/queues/consumers.py @@ -23,15 +23,11 @@ from ..._base_client import ( make_request_options, ) -from ...types.queues import ( - ConsumerGetResponse, - ConsumerCreateResponse, - ConsumerDeleteResponse, - ConsumerUpdateResponse, - consumer_create_params, - consumer_delete_params, - consumer_update_params, -) +from ...types.queues import consumer_create_params, consumer_delete_params, consumer_update_params +from ...types.queues.consumer_get_response import ConsumerGetResponse +from ...types.queues.consumer_create_response import ConsumerCreateResponse +from ...types.queues.consumer_delete_response import ConsumerDeleteResponse +from ...types.queues.consumer_update_response import ConsumerUpdateResponse __all__ = ["Consumers", "AsyncConsumers"] diff --git a/src/cloudflare/resources/queues/messages.py b/src/cloudflare/resources/queues/messages.py index f459cd4a0b2..6b0b3efc89b 100644 --- a/src/cloudflare/resources/queues/messages.py +++ b/src/cloudflare/resources/queues/messages.py @@ -23,7 +23,9 @@ from ..._base_client import ( make_request_options, ) -from ...types.queues import MessageAckResponse, MessagePullResponse, message_ack_params, message_pull_params +from ...types.queues import message_ack_params, message_pull_params +from ...types.queues.message_ack_response import MessageAckResponse +from ...types.queues.message_pull_response import MessagePullResponse __all__ = ["Messages", "AsyncMessages"] diff --git a/src/cloudflare/resources/queues/queues.py b/src/cloudflare/resources/queues/queues.py index 0bee13bfc4c..5cc868aa975 100644 --- a/src/cloudflare/resources/queues/queues.py +++ b/src/cloudflare/resources/queues/queues.py @@ -41,15 +41,11 @@ AsyncPaginator, make_request_options, ) -from ...types.queues import ( - Queue, - QueueCreated, - QueueUpdated, - QueueDeleteResponse, - queue_create_params, - queue_delete_params, - queue_update_params, -) +from ...types.queues import queue_create_params, queue_delete_params, queue_update_params +from ...types.queues.queue import Queue +from ...types.queues.queue_created import QueueCreated +from ...types.queues.queue_updated import QueueUpdated +from ...types.queues.queue_delete_response import QueueDeleteResponse __all__ = ["Queues", "AsyncQueues"] diff --git a/src/cloudflare/resources/r2/buckets.py b/src/cloudflare/resources/r2/buckets.py index 6d31b79045b..b08600ab70e 100644 --- a/src/cloudflare/resources/r2/buckets.py +++ b/src/cloudflare/resources/r2/buckets.py @@ -13,7 +13,7 @@ async_maybe_transform, ) from ..._compat import cached_property -from ...types.r2 import Bucket, bucket_list_params, bucket_create_params +from ...types.r2 import bucket_list_params, bucket_create_params from ..._resource import SyncAPIResource, AsyncAPIResource from ..._response import ( to_raw_response_wrapper, @@ -27,6 +27,7 @@ AsyncPaginator, make_request_options, ) +from ...types.r2.bucket import Bucket __all__ = ["Buckets", "AsyncBuckets"] diff --git a/src/cloudflare/resources/r2/sippy.py b/src/cloudflare/resources/r2/sippy.py index 85832cf33ee..e245dda32a2 100644 --- a/src/cloudflare/resources/r2/sippy.py +++ b/src/cloudflare/resources/r2/sippy.py @@ -13,7 +13,7 @@ async_maybe_transform, ) from ..._compat import cached_property -from ...types.r2 import Sippy, SippyDeleteResponse, sippy_update_params +from ...types.r2 import sippy_update_params from ..._resource import SyncAPIResource, AsyncAPIResource from ..._response import ( to_raw_response_wrapper, @@ -25,6 +25,8 @@ from ..._base_client import ( make_request_options, ) +from ...types.r2.sippy import Sippy +from ...types.r2.sippy_delete_response import SippyDeleteResponse __all__ = ["SippyResource", "AsyncSippyResource"] diff --git a/src/cloudflare/resources/radar/annotations/outages.py b/src/cloudflare/resources/radar/annotations/outages.py index a91b73a86c8..40a6f22a1b7 100644 --- a/src/cloudflare/resources/radar/annotations/outages.py +++ b/src/cloudflare/resources/radar/annotations/outages.py @@ -25,12 +25,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.radar.annotations import ( - OutageGetResponse, - OutageLocationsResponse, - outage_get_params, - outage_locations_params, -) +from ....types.radar.annotations import outage_get_params, outage_locations_params +from ....types.radar.annotations.outage_get_response import OutageGetResponse +from ....types.radar.annotations.outage_locations_response import OutageLocationsResponse __all__ = ["Outages", "AsyncOutages"] diff --git a/src/cloudflare/resources/radar/as112/as112.py b/src/cloudflare/resources/radar/as112/as112.py index 5afddb51fba..a40efffcde5 100644 --- a/src/cloudflare/resources/radar/as112/as112.py +++ b/src/cloudflare/resources/radar/as112/as112.py @@ -38,7 +38,7 @@ async_to_streamed_response_wrapper, ) from ...._wrappers import ResultWrapper -from ....types.radar import AS112TimeseriesResponse, as112_timeseries_params +from ....types.radar import as112_timeseries_params from ...._base_client import ( make_request_options, ) @@ -50,6 +50,7 @@ TimeseriesGroupsWithStreamingResponse, AsyncTimeseriesGroupsWithStreamingResponse, ) +from ....types.radar.as112_timeseries_response import AS112TimeseriesResponse __all__ = ["AS112", "AsyncAS112"] diff --git a/src/cloudflare/resources/radar/as112/summary.py b/src/cloudflare/resources/radar/as112/summary.py index fdec28f39e8..ce36b17a863 100644 --- a/src/cloudflare/resources/radar/as112/summary.py +++ b/src/cloudflare/resources/radar/as112/summary.py @@ -26,12 +26,6 @@ make_request_options, ) from ....types.radar.as112 import ( - SummaryEdnsResponse, - SummaryDNSSECResponse, - SummaryProtocolResponse, - SummaryIPVersionResponse, - SummaryQueryTypeResponse, - SummaryResponseCodesResponse, summary_edns_params, summary_dnssec_params, summary_protocol_params, @@ -39,6 +33,12 @@ summary_query_type_params, summary_response_codes_params, ) +from ....types.radar.as112.summary_edns_response import SummaryEdnsResponse +from ....types.radar.as112.summary_dnssec_response import SummaryDNSSECResponse +from ....types.radar.as112.summary_protocol_response import SummaryProtocolResponse +from ....types.radar.as112.summary_ip_version_response import SummaryIPVersionResponse +from ....types.radar.as112.summary_query_type_response import SummaryQueryTypeResponse +from ....types.radar.as112.summary_response_codes_response import SummaryResponseCodesResponse __all__ = ["Summary", "AsyncSummary"] diff --git a/src/cloudflare/resources/radar/as112/timeseries_groups.py b/src/cloudflare/resources/radar/as112/timeseries_groups.py index e8eaf16cc28..1448b399c3e 100644 --- a/src/cloudflare/resources/radar/as112/timeseries_groups.py +++ b/src/cloudflare/resources/radar/as112/timeseries_groups.py @@ -26,12 +26,6 @@ make_request_options, ) from ....types.radar.as112 import ( - TimeseriesGroupEdnsResponse, - TimeseriesGroupDNSSECResponse, - TimeseriesGroupProtocolResponse, - TimeseriesGroupIPVersionResponse, - TimeseriesGroupQueryTypeResponse, - TimeseriesGroupResponseCodesResponse, timeseries_group_edns_params, timeseries_group_dnssec_params, timeseries_group_protocol_params, @@ -39,6 +33,12 @@ timeseries_group_query_type_params, timeseries_group_response_codes_params, ) +from ....types.radar.as112.timeseries_group_edns_response import TimeseriesGroupEdnsResponse +from ....types.radar.as112.timeseries_group_dnssec_response import TimeseriesGroupDNSSECResponse +from ....types.radar.as112.timeseries_group_protocol_response import TimeseriesGroupProtocolResponse +from ....types.radar.as112.timeseries_group_ip_version_response import TimeseriesGroupIPVersionResponse +from ....types.radar.as112.timeseries_group_query_type_response import TimeseriesGroupQueryTypeResponse +from ....types.radar.as112.timeseries_group_response_codes_response import TimeseriesGroupResponseCodesResponse __all__ = ["TimeseriesGroups", "AsyncTimeseriesGroups"] diff --git a/src/cloudflare/resources/radar/as112/top.py b/src/cloudflare/resources/radar/as112/top.py index e38588c2fc4..ab3fc525a3d 100644 --- a/src/cloudflare/resources/radar/as112/top.py +++ b/src/cloudflare/resources/radar/as112/top.py @@ -25,16 +25,11 @@ from ...._base_client import ( make_request_options, ) -from ....types.radar.as112 import ( - TopEdnsResponse, - TopDNSSECResponse, - TopIPVersionResponse, - TopLocationsResponse, - top_edns_params, - top_dnssec_params, - top_locations_params, - top_ip_version_params, -) +from ....types.radar.as112 import top_edns_params, top_dnssec_params, top_locations_params, top_ip_version_params +from ....types.radar.as112.top_edns_response import TopEdnsResponse +from ....types.radar.as112.top_dnssec_response import TopDNSSECResponse +from ....types.radar.as112.top_locations_response import TopLocationsResponse +from ....types.radar.as112.top_ip_version_response import TopIPVersionResponse __all__ = ["Top", "AsyncTop"] diff --git a/src/cloudflare/resources/radar/attacks/layer3/layer3.py b/src/cloudflare/resources/radar/attacks/layer3/layer3.py index ab72eaea819..bfe3cd87042 100644 --- a/src/cloudflare/resources/radar/attacks/layer3/layer3.py +++ b/src/cloudflare/resources/radar/attacks/layer3/layer3.py @@ -50,7 +50,8 @@ TimeseriesGroupsWithStreamingResponse, AsyncTimeseriesGroupsWithStreamingResponse, ) -from .....types.radar.attacks import Layer3TimeseriesResponse, layer3_timeseries_params +from .....types.radar.attacks import layer3_timeseries_params +from .....types.radar.attacks.layer3_timeseries_response import Layer3TimeseriesResponse __all__ = ["Layer3", "AsyncLayer3"] diff --git a/src/cloudflare/resources/radar/attacks/layer3/summary.py b/src/cloudflare/resources/radar/attacks/layer3/summary.py index 7c1ad3bbf83..d5995d93a62 100644 --- a/src/cloudflare/resources/radar/attacks/layer3/summary.py +++ b/src/cloudflare/resources/radar/attacks/layer3/summary.py @@ -26,12 +26,6 @@ make_request_options, ) from .....types.radar.attacks.layer3 import ( - SummaryGetResponse, - SummaryVectorResponse, - SummaryBitrateResponse, - SummaryDurationResponse, - SummaryProtocolResponse, - SummaryIPVersionResponse, summary_get_params, summary_vector_params, summary_bitrate_params, @@ -39,6 +33,12 @@ summary_protocol_params, summary_ip_version_params, ) +from .....types.radar.attacks.layer3.summary_get_response import SummaryGetResponse +from .....types.radar.attacks.layer3.summary_vector_response import SummaryVectorResponse +from .....types.radar.attacks.layer3.summary_bitrate_response import SummaryBitrateResponse +from .....types.radar.attacks.layer3.summary_duration_response import SummaryDurationResponse +from .....types.radar.attacks.layer3.summary_protocol_response import SummaryProtocolResponse +from .....types.radar.attacks.layer3.summary_ip_version_response import SummaryIPVersionResponse __all__ = ["Summary", "AsyncSummary"] diff --git a/src/cloudflare/resources/radar/attacks/layer3/timeseries_groups.py b/src/cloudflare/resources/radar/attacks/layer3/timeseries_groups.py index 702f89b732a..6871baacba7 100644 --- a/src/cloudflare/resources/radar/attacks/layer3/timeseries_groups.py +++ b/src/cloudflare/resources/radar/attacks/layer3/timeseries_groups.py @@ -26,14 +26,6 @@ make_request_options, ) from .....types.radar.attacks.layer3 import ( - TimeseriesGroupGetResponse, - TimeseriesGroupVectorResponse, - TimeseriesGroupBitrateResponse, - TimeseriesGroupDurationResponse, - TimeseriesGroupIndustryResponse, - TimeseriesGroupProtocolResponse, - TimeseriesGroupVerticalResponse, - TimeseriesGroupIPVersionResponse, timeseries_group_get_params, timeseries_group_vector_params, timeseries_group_bitrate_params, @@ -43,6 +35,14 @@ timeseries_group_vertical_params, timeseries_group_ip_version_params, ) +from .....types.radar.attacks.layer3.timeseries_group_get_response import TimeseriesGroupGetResponse +from .....types.radar.attacks.layer3.timeseries_group_vector_response import TimeseriesGroupVectorResponse +from .....types.radar.attacks.layer3.timeseries_group_bitrate_response import TimeseriesGroupBitrateResponse +from .....types.radar.attacks.layer3.timeseries_group_duration_response import TimeseriesGroupDurationResponse +from .....types.radar.attacks.layer3.timeseries_group_industry_response import TimeseriesGroupIndustryResponse +from .....types.radar.attacks.layer3.timeseries_group_protocol_response import TimeseriesGroupProtocolResponse +from .....types.radar.attacks.layer3.timeseries_group_vertical_response import TimeseriesGroupVerticalResponse +from .....types.radar.attacks.layer3.timeseries_group_ip_version_response import TimeseriesGroupIPVersionResponse __all__ = ["TimeseriesGroups", "AsyncTimeseriesGroups"] diff --git a/src/cloudflare/resources/radar/attacks/layer3/top/locations.py b/src/cloudflare/resources/radar/attacks/layer3/top/locations.py index e7e516c3838..ee3469298eb 100644 --- a/src/cloudflare/resources/radar/attacks/layer3/top/locations.py +++ b/src/cloudflare/resources/radar/attacks/layer3/top/locations.py @@ -25,12 +25,9 @@ from ......_base_client import ( make_request_options, ) -from ......types.radar.attacks.layer3.top import ( - LocationOriginResponse, - LocationTargetResponse, - location_origin_params, - location_target_params, -) +from ......types.radar.attacks.layer3.top import location_origin_params, location_target_params +from ......types.radar.attacks.layer3.top.location_origin_response import LocationOriginResponse +from ......types.radar.attacks.layer3.top.location_target_response import LocationTargetResponse __all__ = ["Locations", "AsyncLocations"] diff --git a/src/cloudflare/resources/radar/attacks/layer3/top/top.py b/src/cloudflare/resources/radar/attacks/layer3/top/top.py index 30d847d06f9..3a96ed9dbaa 100644 --- a/src/cloudflare/resources/radar/attacks/layer3/top/top.py +++ b/src/cloudflare/resources/radar/attacks/layer3/top/top.py @@ -33,14 +33,10 @@ from ......_base_client import ( make_request_options, ) -from ......types.radar.attacks.layer3 import ( - TopAttacksResponse, - TopIndustryResponse, - TopVerticalResponse, - top_attacks_params, - top_industry_params, - top_vertical_params, -) +from ......types.radar.attacks.layer3 import top_attacks_params, top_industry_params, top_vertical_params +from ......types.radar.attacks.layer3.top_attacks_response import TopAttacksResponse +from ......types.radar.attacks.layer3.top_industry_response import TopIndustryResponse +from ......types.radar.attacks.layer3.top_vertical_response import TopVerticalResponse __all__ = ["Top", "AsyncTop"] diff --git a/src/cloudflare/resources/radar/attacks/layer7/layer7.py b/src/cloudflare/resources/radar/attacks/layer7/layer7.py index 35d0c68eacc..d054908ff20 100644 --- a/src/cloudflare/resources/radar/attacks/layer7/layer7.py +++ b/src/cloudflare/resources/radar/attacks/layer7/layer7.py @@ -50,7 +50,8 @@ TimeseriesGroupsWithStreamingResponse, AsyncTimeseriesGroupsWithStreamingResponse, ) -from .....types.radar.attacks import Layer7TimeseriesResponse, layer7_timeseries_params +from .....types.radar.attacks import layer7_timeseries_params +from .....types.radar.attacks.layer7_timeseries_response import Layer7TimeseriesResponse __all__ = ["Layer7", "AsyncLayer7"] diff --git a/src/cloudflare/resources/radar/attacks/layer7/summary.py b/src/cloudflare/resources/radar/attacks/layer7/summary.py index f96de6998f0..f189a2ccf4e 100644 --- a/src/cloudflare/resources/radar/attacks/layer7/summary.py +++ b/src/cloudflare/resources/radar/attacks/layer7/summary.py @@ -26,12 +26,6 @@ make_request_options, ) from .....types.radar.attacks.layer7 import ( - SummaryGetResponse, - SummaryIPVersionResponse, - SummaryHTTPMethodResponse, - SummaryHTTPVersionResponse, - SummaryManagedRulesResponse, - SummaryMitigationProductResponse, summary_get_params, summary_ip_version_params, summary_http_method_params, @@ -39,6 +33,12 @@ summary_managed_rules_params, summary_mitigation_product_params, ) +from .....types.radar.attacks.layer7.summary_get_response import SummaryGetResponse +from .....types.radar.attacks.layer7.summary_ip_version_response import SummaryIPVersionResponse +from .....types.radar.attacks.layer7.summary_http_method_response import SummaryHTTPMethodResponse +from .....types.radar.attacks.layer7.summary_http_version_response import SummaryHTTPVersionResponse +from .....types.radar.attacks.layer7.summary_managed_rules_response import SummaryManagedRulesResponse +from .....types.radar.attacks.layer7.summary_mitigation_product_response import SummaryMitigationProductResponse __all__ = ["Summary", "AsyncSummary"] diff --git a/src/cloudflare/resources/radar/attacks/layer7/timeseries_groups.py b/src/cloudflare/resources/radar/attacks/layer7/timeseries_groups.py index 01777c1b3d2..162aacdbb51 100644 --- a/src/cloudflare/resources/radar/attacks/layer7/timeseries_groups.py +++ b/src/cloudflare/resources/radar/attacks/layer7/timeseries_groups.py @@ -26,14 +26,6 @@ make_request_options, ) from .....types.radar.attacks.layer7 import ( - TimeseriesGroupGetResponse, - TimeseriesGroupIndustryResponse, - TimeseriesGroupVerticalResponse, - TimeseriesGroupIPVersionResponse, - TimeseriesGroupHTTPMethodResponse, - TimeseriesGroupHTTPVersionResponse, - TimeseriesGroupManagedRulesResponse, - TimeseriesGroupMitigationProductResponse, timeseries_group_get_params, timeseries_group_industry_params, timeseries_group_vertical_params, @@ -43,6 +35,16 @@ timeseries_group_managed_rules_params, timeseries_group_mitigation_product_params, ) +from .....types.radar.attacks.layer7.timeseries_group_get_response import TimeseriesGroupGetResponse +from .....types.radar.attacks.layer7.timeseries_group_industry_response import TimeseriesGroupIndustryResponse +from .....types.radar.attacks.layer7.timeseries_group_vertical_response import TimeseriesGroupVerticalResponse +from .....types.radar.attacks.layer7.timeseries_group_ip_version_response import TimeseriesGroupIPVersionResponse +from .....types.radar.attacks.layer7.timeseries_group_http_method_response import TimeseriesGroupHTTPMethodResponse +from .....types.radar.attacks.layer7.timeseries_group_http_version_response import TimeseriesGroupHTTPVersionResponse +from .....types.radar.attacks.layer7.timeseries_group_managed_rules_response import TimeseriesGroupManagedRulesResponse +from .....types.radar.attacks.layer7.timeseries_group_mitigation_product_response import ( + TimeseriesGroupMitigationProductResponse, +) __all__ = ["TimeseriesGroups", "AsyncTimeseriesGroups"] diff --git a/src/cloudflare/resources/radar/attacks/layer7/top/ases.py b/src/cloudflare/resources/radar/attacks/layer7/top/ases.py index 69fc30d3e72..0784b434c88 100644 --- a/src/cloudflare/resources/radar/attacks/layer7/top/ases.py +++ b/src/cloudflare/resources/radar/attacks/layer7/top/ases.py @@ -25,7 +25,8 @@ from ......_base_client import ( make_request_options, ) -from ......types.radar.attacks.layer7.top import AseOriginResponse, ase_origin_params +from ......types.radar.attacks.layer7.top import ase_origin_params +from ......types.radar.attacks.layer7.top.ase_origin_response import AseOriginResponse __all__ = ["Ases", "AsyncAses"] diff --git a/src/cloudflare/resources/radar/attacks/layer7/top/locations.py b/src/cloudflare/resources/radar/attacks/layer7/top/locations.py index 5c216848918..79bce7bed50 100644 --- a/src/cloudflare/resources/radar/attacks/layer7/top/locations.py +++ b/src/cloudflare/resources/radar/attacks/layer7/top/locations.py @@ -25,12 +25,9 @@ from ......_base_client import ( make_request_options, ) -from ......types.radar.attacks.layer7.top import ( - LocationOriginResponse, - LocationTargetResponse, - location_origin_params, - location_target_params, -) +from ......types.radar.attacks.layer7.top import location_origin_params, location_target_params +from ......types.radar.attacks.layer7.top.location_origin_response import LocationOriginResponse +from ......types.radar.attacks.layer7.top.location_target_response import LocationTargetResponse __all__ = ["Locations", "AsyncLocations"] diff --git a/src/cloudflare/resources/radar/attacks/layer7/top/top.py b/src/cloudflare/resources/radar/attacks/layer7/top/top.py index 86c045d480d..cac3230a2f9 100644 --- a/src/cloudflare/resources/radar/attacks/layer7/top/top.py +++ b/src/cloudflare/resources/radar/attacks/layer7/top/top.py @@ -41,14 +41,10 @@ from ......_base_client import ( make_request_options, ) -from ......types.radar.attacks.layer7 import ( - TopAttacksResponse, - TopIndustryResponse, - TopVerticalResponse, - top_attacks_params, - top_industry_params, - top_vertical_params, -) +from ......types.radar.attacks.layer7 import top_attacks_params, top_industry_params, top_vertical_params +from ......types.radar.attacks.layer7.top_attacks_response import TopAttacksResponse +from ......types.radar.attacks.layer7.top_industry_response import TopIndustryResponse +from ......types.radar.attacks.layer7.top_vertical_response import TopVerticalResponse __all__ = ["Top", "AsyncTop"] diff --git a/src/cloudflare/resources/radar/bgp/bgp.py b/src/cloudflare/resources/radar/bgp/bgp.py index e7045e3beca..2cba45187b1 100644 --- a/src/cloudflare/resources/radar/bgp/bgp.py +++ b/src/cloudflare/resources/radar/bgp/bgp.py @@ -56,11 +56,12 @@ async_to_streamed_response_wrapper, ) from ...._wrappers import ResultWrapper -from ....types.radar import BGPTimeseriesResponse, bgp_timeseries_params +from ....types.radar import bgp_timeseries_params from ...._base_client import ( make_request_options, ) from .hijacks.hijacks import Hijacks, AsyncHijacks +from ....types.radar.bgp_timeseries_response import BGPTimeseriesResponse __all__ = ["BGP", "AsyncBGP"] diff --git a/src/cloudflare/resources/radar/bgp/hijacks/events.py b/src/cloudflare/resources/radar/bgp/hijacks/events.py index 12be32c82c0..ad46bee9d43 100644 --- a/src/cloudflare/resources/radar/bgp/hijacks/events.py +++ b/src/cloudflare/resources/radar/bgp/hijacks/events.py @@ -23,7 +23,8 @@ AsyncPaginator, make_request_options, ) -from .....types.radar.bgp.hijacks import EventListResponse, event_list_params +from .....types.radar.bgp.hijacks import event_list_params +from .....types.radar.bgp.hijacks.event_list_response import EventListResponse __all__ = ["Events", "AsyncEvents"] diff --git a/src/cloudflare/resources/radar/bgp/leaks/events.py b/src/cloudflare/resources/radar/bgp/leaks/events.py index bb67456f087..b17cce8c963 100644 --- a/src/cloudflare/resources/radar/bgp/leaks/events.py +++ b/src/cloudflare/resources/radar/bgp/leaks/events.py @@ -23,7 +23,8 @@ AsyncPaginator, make_request_options, ) -from .....types.radar.bgp.leaks import EventListResponse, event_list_params +from .....types.radar.bgp.leaks import event_list_params +from .....types.radar.bgp.leaks.event_list_response import EventListResponse __all__ = ["Events", "AsyncEvents"] diff --git a/src/cloudflare/resources/radar/bgp/routes.py b/src/cloudflare/resources/radar/bgp/routes.py index bb0d760f7c0..4dddda2c1c4 100644 --- a/src/cloudflare/resources/radar/bgp/routes.py +++ b/src/cloudflare/resources/radar/bgp/routes.py @@ -25,16 +25,11 @@ from ...._base_client import ( make_request_options, ) -from ....types.radar.bgp import ( - RouteMoasResponse, - RouteStatsResponse, - RoutePfx2asResponse, - RouteTimeseriesResponse, - route_moas_params, - route_stats_params, - route_pfx2as_params, - route_timeseries_params, -) +from ....types.radar.bgp import route_moas_params, route_stats_params, route_pfx2as_params, route_timeseries_params +from ....types.radar.bgp.route_moas_response import RouteMoasResponse +from ....types.radar.bgp.route_stats_response import RouteStatsResponse +from ....types.radar.bgp.route_pfx2as_response import RoutePfx2asResponse +from ....types.radar.bgp.route_timeseries_response import RouteTimeseriesResponse __all__ = ["Routes", "AsyncRoutes"] diff --git a/src/cloudflare/resources/radar/bgp/top/ases.py b/src/cloudflare/resources/radar/bgp/top/ases.py index 9dbc4cbef73..984bf73c0e2 100644 --- a/src/cloudflare/resources/radar/bgp/top/ases.py +++ b/src/cloudflare/resources/radar/bgp/top/ases.py @@ -25,7 +25,9 @@ from ....._base_client import ( make_request_options, ) -from .....types.radar.bgp.top import AseGetResponse, AsePrefixesResponse, ase_get_params, ase_prefixes_params +from .....types.radar.bgp.top import ase_get_params, ase_prefixes_params +from .....types.radar.bgp.top.ase_get_response import AseGetResponse +from .....types.radar.bgp.top.ase_prefixes_response import AsePrefixesResponse __all__ = ["Ases", "AsyncAses"] diff --git a/src/cloudflare/resources/radar/bgp/top/top.py b/src/cloudflare/resources/radar/bgp/top/top.py index 063d49d3953..5ffa91509f6 100644 --- a/src/cloudflare/resources/radar/bgp/top/top.py +++ b/src/cloudflare/resources/radar/bgp/top/top.py @@ -33,7 +33,8 @@ from ....._base_client import ( make_request_options, ) -from .....types.radar.bgp import TopPrefixesResponse, top_prefixes_params +from .....types.radar.bgp import top_prefixes_params +from .....types.radar.bgp.top_prefixes_response import TopPrefixesResponse __all__ = ["Top", "AsyncTop"] diff --git a/src/cloudflare/resources/radar/connection_tampering.py b/src/cloudflare/resources/radar/connection_tampering.py index 2eb7a1a6ded..b39ca0f6dfa 100644 --- a/src/cloudflare/resources/radar/connection_tampering.py +++ b/src/cloudflare/resources/radar/connection_tampering.py @@ -22,15 +22,12 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.radar import ( - ConnectionTamperingSummaryResponse, - ConnectionTamperingTimeseriesGroupsResponse, - connection_tampering_summary_params, - connection_tampering_timeseries_groups_params, -) +from ...types.radar import connection_tampering_summary_params, connection_tampering_timeseries_groups_params from ..._base_client import ( make_request_options, ) +from ...types.radar.connection_tampering_summary_response import ConnectionTamperingSummaryResponse +from ...types.radar.connection_tampering_timeseries_groups_response import ConnectionTamperingTimeseriesGroupsResponse __all__ = ["ConnectionTampering", "AsyncConnectionTampering"] diff --git a/src/cloudflare/resources/radar/datasets.py b/src/cloudflare/resources/radar/datasets.py index 6366815b28d..5842f11af8c 100644 --- a/src/cloudflare/resources/radar/datasets.py +++ b/src/cloudflare/resources/radar/datasets.py @@ -21,16 +21,12 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.radar import ( - DatasetListResponse, - DatasetDownloadResponse, - dataset_get_params, - dataset_list_params, - dataset_download_params, -) +from ...types.radar import dataset_get_params, dataset_list_params, dataset_download_params from ..._base_client import ( make_request_options, ) +from ...types.radar.dataset_list_response import DatasetListResponse +from ...types.radar.dataset_download_response import DatasetDownloadResponse __all__ = ["Datasets", "AsyncDatasets"] diff --git a/src/cloudflare/resources/radar/dns/top.py b/src/cloudflare/resources/radar/dns/top.py index ede1be67fad..3cf5f34da38 100644 --- a/src/cloudflare/resources/radar/dns/top.py +++ b/src/cloudflare/resources/radar/dns/top.py @@ -25,7 +25,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.radar.dns import TopAsesResponse, TopLocationsResponse, top_ases_params, top_locations_params +from ....types.radar.dns import top_ases_params, top_locations_params +from ....types.radar.dns.top_ases_response import TopAsesResponse +from ....types.radar.dns.top_locations_response import TopLocationsResponse __all__ = ["Top", "AsyncTop"] diff --git a/src/cloudflare/resources/radar/email/routing/summary.py b/src/cloudflare/resources/radar/email/routing/summary.py index f4af4bd7076..2b6f4459641 100644 --- a/src/cloudflare/resources/radar/email/routing/summary.py +++ b/src/cloudflare/resources/radar/email/routing/summary.py @@ -26,12 +26,6 @@ make_request_options, ) from .....types.radar.email.routing import ( - SummaryARCResponse, - SummarySPFResponse, - SummaryDKIMResponse, - SummaryDMARCResponse, - SummaryEncryptedResponse, - SummaryIPVersionResponse, summary_arc_params, summary_spf_params, summary_dkim_params, @@ -39,6 +33,12 @@ summary_encrypted_params, summary_ip_version_params, ) +from .....types.radar.email.routing.summary_arc_response import SummaryARCResponse +from .....types.radar.email.routing.summary_spf_response import SummarySPFResponse +from .....types.radar.email.routing.summary_dkim_response import SummaryDKIMResponse +from .....types.radar.email.routing.summary_dmarc_response import SummaryDMARCResponse +from .....types.radar.email.routing.summary_encrypted_response import SummaryEncryptedResponse +from .....types.radar.email.routing.summary_ip_version_response import SummaryIPVersionResponse __all__ = ["Summary", "AsyncSummary"] diff --git a/src/cloudflare/resources/radar/email/routing/timeseries_groups.py b/src/cloudflare/resources/radar/email/routing/timeseries_groups.py index 50444b44e0b..e86bd7944d2 100644 --- a/src/cloudflare/resources/radar/email/routing/timeseries_groups.py +++ b/src/cloudflare/resources/radar/email/routing/timeseries_groups.py @@ -26,12 +26,6 @@ make_request_options, ) from .....types.radar.email.routing import ( - TimeseriesGroupARCResponse, - TimeseriesGroupSPFResponse, - TimeseriesGroupDKIMResponse, - TimeseriesGroupDMARCResponse, - TimeseriesGroupEncryptedResponse, - TimeseriesGroupIPVersionResponse, timeseries_group_arc_params, timeseries_group_spf_params, timeseries_group_dkim_params, @@ -39,6 +33,12 @@ timeseries_group_encrypted_params, timeseries_group_ip_version_params, ) +from .....types.radar.email.routing.timeseries_group_arc_response import TimeseriesGroupARCResponse +from .....types.radar.email.routing.timeseries_group_spf_response import TimeseriesGroupSPFResponse +from .....types.radar.email.routing.timeseries_group_dkim_response import TimeseriesGroupDKIMResponse +from .....types.radar.email.routing.timeseries_group_dmarc_response import TimeseriesGroupDMARCResponse +from .....types.radar.email.routing.timeseries_group_encrypted_response import TimeseriesGroupEncryptedResponse +from .....types.radar.email.routing.timeseries_group_ip_version_response import TimeseriesGroupIPVersionResponse __all__ = ["TimeseriesGroups", "AsyncTimeseriesGroups"] diff --git a/src/cloudflare/resources/radar/email/security/summary.py b/src/cloudflare/resources/radar/email/security/summary.py index 9016b3a8537..a9aa1c1424f 100644 --- a/src/cloudflare/resources/radar/email/security/summary.py +++ b/src/cloudflare/resources/radar/email/security/summary.py @@ -26,15 +26,6 @@ make_request_options, ) from .....types.radar.email.security import ( - SummaryARCResponse, - SummarySPFResponse, - SummaryDKIMResponse, - SummarySpamResponse, - SummaryDMARCResponse, - SummarySpoofResponse, - SummaryMaliciousResponse, - SummaryTLSVersionResponse, - SummaryThreatCategoryResponse, summary_arc_params, summary_spf_params, summary_dkim_params, @@ -45,6 +36,15 @@ summary_tls_version_params, summary_threat_category_params, ) +from .....types.radar.email.security.summary_arc_response import SummaryARCResponse +from .....types.radar.email.security.summary_spf_response import SummarySPFResponse +from .....types.radar.email.security.summary_dkim_response import SummaryDKIMResponse +from .....types.radar.email.security.summary_spam_response import SummarySpamResponse +from .....types.radar.email.security.summary_dmarc_response import SummaryDMARCResponse +from .....types.radar.email.security.summary_spoof_response import SummarySpoofResponse +from .....types.radar.email.security.summary_malicious_response import SummaryMaliciousResponse +from .....types.radar.email.security.summary_tls_version_response import SummaryTLSVersionResponse +from .....types.radar.email.security.summary_threat_category_response import SummaryThreatCategoryResponse __all__ = ["Summary", "AsyncSummary"] diff --git a/src/cloudflare/resources/radar/email/security/timeseries_groups.py b/src/cloudflare/resources/radar/email/security/timeseries_groups.py index 8bba1690392..17d51f7e25d 100644 --- a/src/cloudflare/resources/radar/email/security/timeseries_groups.py +++ b/src/cloudflare/resources/radar/email/security/timeseries_groups.py @@ -26,15 +26,6 @@ make_request_options, ) from .....types.radar.email.security import ( - TimeseriesGroupARCResponse, - TimeseriesGroupSPFResponse, - TimeseriesGroupDKIMResponse, - TimeseriesGroupSpamResponse, - TimeseriesGroupDMARCResponse, - TimeseriesGroupSpoofResponse, - TimeseriesGroupMaliciousResponse, - TimeseriesGroupTLSVersionResponse, - TimeseriesGroupThreatCategoryResponse, timeseries_group_arc_params, timeseries_group_spf_params, timeseries_group_dkim_params, @@ -45,6 +36,17 @@ timeseries_group_tls_version_params, timeseries_group_threat_category_params, ) +from .....types.radar.email.security.timeseries_group_arc_response import TimeseriesGroupARCResponse +from .....types.radar.email.security.timeseries_group_spf_response import TimeseriesGroupSPFResponse +from .....types.radar.email.security.timeseries_group_dkim_response import TimeseriesGroupDKIMResponse +from .....types.radar.email.security.timeseries_group_spam_response import TimeseriesGroupSpamResponse +from .....types.radar.email.security.timeseries_group_dmarc_response import TimeseriesGroupDMARCResponse +from .....types.radar.email.security.timeseries_group_spoof_response import TimeseriesGroupSpoofResponse +from .....types.radar.email.security.timeseries_group_malicious_response import TimeseriesGroupMaliciousResponse +from .....types.radar.email.security.timeseries_group_tls_version_response import TimeseriesGroupTLSVersionResponse +from .....types.radar.email.security.timeseries_group_threat_category_response import ( + TimeseriesGroupThreatCategoryResponse, +) __all__ = ["TimeseriesGroups", "AsyncTimeseriesGroups"] diff --git a/src/cloudflare/resources/radar/email/security/top/tlds/malicious.py b/src/cloudflare/resources/radar/email/security/top/tlds/malicious.py index 7762f403249..e78d51055d1 100644 --- a/src/cloudflare/resources/radar/email/security/top/tlds/malicious.py +++ b/src/cloudflare/resources/radar/email/security/top/tlds/malicious.py @@ -25,7 +25,8 @@ from ......._base_client import ( make_request_options, ) -from .......types.radar.email.security.top.tlds import MaliciousGetResponse, malicious_get_params +from .......types.radar.email.security.top.tlds import malicious_get_params +from .......types.radar.email.security.top.tlds.malicious_get_response import MaliciousGetResponse __all__ = ["Malicious", "AsyncMalicious"] diff --git a/src/cloudflare/resources/radar/email/security/top/tlds/spam.py b/src/cloudflare/resources/radar/email/security/top/tlds/spam.py index 780cf05b6e3..06a53fc09a7 100644 --- a/src/cloudflare/resources/radar/email/security/top/tlds/spam.py +++ b/src/cloudflare/resources/radar/email/security/top/tlds/spam.py @@ -25,7 +25,8 @@ from ......._base_client import ( make_request_options, ) -from .......types.radar.email.security.top.tlds import SpamGetResponse, spam_get_params +from .......types.radar.email.security.top.tlds import spam_get_params +from .......types.radar.email.security.top.tlds.spam_get_response import SpamGetResponse __all__ = ["Spam", "AsyncSpam"] diff --git a/src/cloudflare/resources/radar/email/security/top/tlds/spoof.py b/src/cloudflare/resources/radar/email/security/top/tlds/spoof.py index 69fc129b7d4..9af3f30a09f 100644 --- a/src/cloudflare/resources/radar/email/security/top/tlds/spoof.py +++ b/src/cloudflare/resources/radar/email/security/top/tlds/spoof.py @@ -25,7 +25,8 @@ from ......._base_client import ( make_request_options, ) -from .......types.radar.email.security.top.tlds import SpoofGetResponse, spoof_get_params +from .......types.radar.email.security.top.tlds import spoof_get_params +from .......types.radar.email.security.top.tlds.spoof_get_response import SpoofGetResponse __all__ = ["Spoof", "AsyncSpoof"] diff --git a/src/cloudflare/resources/radar/email/security/top/tlds/tlds.py b/src/cloudflare/resources/radar/email/security/top/tlds/tlds.py index 5e64f5d7421..3a3b66e9a78 100644 --- a/src/cloudflare/resources/radar/email/security/top/tlds/tlds.py +++ b/src/cloudflare/resources/radar/email/security/top/tlds/tlds.py @@ -49,7 +49,8 @@ from ......._base_client import ( make_request_options, ) -from .......types.radar.email.security.top import TldGetResponse, tld_get_params +from .......types.radar.email.security.top import tld_get_params +from .......types.radar.email.security.top.tld_get_response import TldGetResponse __all__ = ["Tlds", "AsyncTlds"] diff --git a/src/cloudflare/resources/radar/entities/asns.py b/src/cloudflare/resources/radar/entities/asns.py index ee2d3a2dc28..e2d0b0a51f7 100644 --- a/src/cloudflare/resources/radar/entities/asns.py +++ b/src/cloudflare/resources/radar/entities/asns.py @@ -24,16 +24,11 @@ from ...._base_client import ( make_request_options, ) -from ....types.radar.entities import ( - ASNIPResponse, - ASNGetResponse, - ASNRelResponse, - ASNListResponse, - asn_ip_params, - asn_get_params, - asn_rel_params, - asn_list_params, -) +from ....types.radar.entities import asn_ip_params, asn_get_params, asn_rel_params, asn_list_params +from ....types.radar.entities.asn_ip_response import ASNIPResponse +from ....types.radar.entities.asn_get_response import ASNGetResponse +from ....types.radar.entities.asn_rel_response import ASNRelResponse +from ....types.radar.entities.asn_list_response import ASNListResponse __all__ = ["ASNs", "AsyncASNs"] diff --git a/src/cloudflare/resources/radar/entities/entities.py b/src/cloudflare/resources/radar/entities/entities.py index 635c2848ee0..fad07fb0490 100644 --- a/src/cloudflare/resources/radar/entities/entities.py +++ b/src/cloudflare/resources/radar/entities/entities.py @@ -37,10 +37,11 @@ async_to_streamed_response_wrapper, ) from ...._wrappers import ResultWrapper -from ....types.radar import EntityGetResponse, entity_get_params +from ....types.radar import entity_get_params from ...._base_client import ( make_request_options, ) +from ....types.radar.entity_get_response import EntityGetResponse __all__ = ["Entities", "AsyncEntities"] diff --git a/src/cloudflare/resources/radar/entities/locations.py b/src/cloudflare/resources/radar/entities/locations.py index 075a8c32b19..93efe29d505 100644 --- a/src/cloudflare/resources/radar/entities/locations.py +++ b/src/cloudflare/resources/radar/entities/locations.py @@ -24,12 +24,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.radar.entities import ( - LocationGetResponse, - LocationListResponse, - location_get_params, - location_list_params, -) +from ....types.radar.entities import location_get_params, location_list_params +from ....types.radar.entities.location_get_response import LocationGetResponse +from ....types.radar.entities.location_list_response import LocationListResponse __all__ = ["Locations", "AsyncLocations"] diff --git a/src/cloudflare/resources/radar/http/ases/ases.py b/src/cloudflare/resources/radar/http/ases/ases.py index fadba721289..c21a3d8584c 100644 --- a/src/cloudflare/resources/radar/http/ases/ases.py +++ b/src/cloudflare/resources/radar/http/ases/ases.py @@ -81,7 +81,8 @@ from ....._base_client import ( make_request_options, ) -from .....types.radar.http import AseGetResponse, ase_get_params +from .....types.radar.http import ase_get_params +from .....types.radar.http.ase_get_response import AseGetResponse __all__ = ["Ases", "AsyncAses"] diff --git a/src/cloudflare/resources/radar/http/ases/bot_class.py b/src/cloudflare/resources/radar/http/ases/bot_class.py index cbff48e7c29..c9e5e10167b 100644 --- a/src/cloudflare/resources/radar/http/ases/bot_class.py +++ b/src/cloudflare/resources/radar/http/ases/bot_class.py @@ -25,7 +25,8 @@ from ....._base_client import ( make_request_options, ) -from .....types.radar.http.ases import BotClassGetResponse, bot_class_get_params +from .....types.radar.http.ases import bot_class_get_params +from .....types.radar.http.ases.bot_class_get_response import BotClassGetResponse __all__ = ["BotClass", "AsyncBotClass"] diff --git a/src/cloudflare/resources/radar/http/ases/device_type.py b/src/cloudflare/resources/radar/http/ases/device_type.py index d7799052f43..88a1fc4558f 100644 --- a/src/cloudflare/resources/radar/http/ases/device_type.py +++ b/src/cloudflare/resources/radar/http/ases/device_type.py @@ -25,7 +25,8 @@ from ....._base_client import ( make_request_options, ) -from .....types.radar.http.ases import DeviceTypeGetResponse, device_type_get_params +from .....types.radar.http.ases import device_type_get_params +from .....types.radar.http.ases.device_type_get_response import DeviceTypeGetResponse __all__ = ["DeviceType", "AsyncDeviceType"] diff --git a/src/cloudflare/resources/radar/http/ases/http_method.py b/src/cloudflare/resources/radar/http/ases/http_method.py index 171c9609c75..cfe7fcf6c1f 100644 --- a/src/cloudflare/resources/radar/http/ases/http_method.py +++ b/src/cloudflare/resources/radar/http/ases/http_method.py @@ -25,7 +25,8 @@ from ....._base_client import ( make_request_options, ) -from .....types.radar.http.ases import HTTPMethodGetResponse, http_method_get_params +from .....types.radar.http.ases import http_method_get_params +from .....types.radar.http.ases.http_method_get_response import HTTPMethodGetResponse __all__ = ["HTTPMethod", "AsyncHTTPMethod"] diff --git a/src/cloudflare/resources/radar/http/ases/http_protocol.py b/src/cloudflare/resources/radar/http/ases/http_protocol.py index 3d41ae2202a..3bbb8b23e06 100644 --- a/src/cloudflare/resources/radar/http/ases/http_protocol.py +++ b/src/cloudflare/resources/radar/http/ases/http_protocol.py @@ -25,7 +25,8 @@ from ....._base_client import ( make_request_options, ) -from .....types.radar.http.ases import HTTPProtocolGetResponse, http_protocol_get_params +from .....types.radar.http.ases import http_protocol_get_params +from .....types.radar.http.ases.http_protocol_get_response import HTTPProtocolGetResponse __all__ = ["HTTPProtocol", "AsyncHTTPProtocol"] diff --git a/src/cloudflare/resources/radar/http/ases/ip_version.py b/src/cloudflare/resources/radar/http/ases/ip_version.py index 2c206c968e5..61e9a074641 100644 --- a/src/cloudflare/resources/radar/http/ases/ip_version.py +++ b/src/cloudflare/resources/radar/http/ases/ip_version.py @@ -25,7 +25,8 @@ from ....._base_client import ( make_request_options, ) -from .....types.radar.http.ases import IPVersionGetResponse, ip_version_get_params +from .....types.radar.http.ases import ip_version_get_params +from .....types.radar.http.ases.ip_version_get_response import IPVersionGetResponse __all__ = ["IPVersion", "AsyncIPVersion"] diff --git a/src/cloudflare/resources/radar/http/ases/os.py b/src/cloudflare/resources/radar/http/ases/os.py index 4fc4fac72ae..86a147dcf38 100644 --- a/src/cloudflare/resources/radar/http/ases/os.py +++ b/src/cloudflare/resources/radar/http/ases/os.py @@ -25,7 +25,8 @@ from ....._base_client import ( make_request_options, ) -from .....types.radar.http.ases import OSGetResponse, os_get_params +from .....types.radar.http.ases import os_get_params +from .....types.radar.http.ases.os_get_response import OSGetResponse __all__ = ["OS", "AsyncOS"] diff --git a/src/cloudflare/resources/radar/http/ases/tls_version.py b/src/cloudflare/resources/radar/http/ases/tls_version.py index 2f6440e20f2..3524d76f10a 100644 --- a/src/cloudflare/resources/radar/http/ases/tls_version.py +++ b/src/cloudflare/resources/radar/http/ases/tls_version.py @@ -25,7 +25,8 @@ from ....._base_client import ( make_request_options, ) -from .....types.radar.http.ases import TLSVersionGetResponse, tls_version_get_params +from .....types.radar.http.ases import tls_version_get_params +from .....types.radar.http.ases.tls_version_get_response import TLSVersionGetResponse __all__ = ["TLSVersion", "AsyncTLSVersion"] diff --git a/src/cloudflare/resources/radar/http/locations/bot_class.py b/src/cloudflare/resources/radar/http/locations/bot_class.py index ab1fd138d1d..3cdc55105ef 100644 --- a/src/cloudflare/resources/radar/http/locations/bot_class.py +++ b/src/cloudflare/resources/radar/http/locations/bot_class.py @@ -25,7 +25,8 @@ from ....._base_client import ( make_request_options, ) -from .....types.radar.http.locations import BotClassGetResponse, bot_class_get_params +from .....types.radar.http.locations import bot_class_get_params +from .....types.radar.http.locations.bot_class_get_response import BotClassGetResponse __all__ = ["BotClass", "AsyncBotClass"] diff --git a/src/cloudflare/resources/radar/http/locations/device_type.py b/src/cloudflare/resources/radar/http/locations/device_type.py index f78018d0553..dccf41526fa 100644 --- a/src/cloudflare/resources/radar/http/locations/device_type.py +++ b/src/cloudflare/resources/radar/http/locations/device_type.py @@ -25,7 +25,8 @@ from ....._base_client import ( make_request_options, ) -from .....types.radar.http.locations import DeviceTypeGetResponse, device_type_get_params +from .....types.radar.http.locations import device_type_get_params +from .....types.radar.http.locations.device_type_get_response import DeviceTypeGetResponse __all__ = ["DeviceType", "AsyncDeviceType"] diff --git a/src/cloudflare/resources/radar/http/locations/http_method.py b/src/cloudflare/resources/radar/http/locations/http_method.py index 28e3ac9adf8..e2af82d40d9 100644 --- a/src/cloudflare/resources/radar/http/locations/http_method.py +++ b/src/cloudflare/resources/radar/http/locations/http_method.py @@ -25,7 +25,8 @@ from ....._base_client import ( make_request_options, ) -from .....types.radar.http.locations import HTTPMethodGetResponse, http_method_get_params +from .....types.radar.http.locations import http_method_get_params +from .....types.radar.http.locations.http_method_get_response import HTTPMethodGetResponse __all__ = ["HTTPMethod", "AsyncHTTPMethod"] diff --git a/src/cloudflare/resources/radar/http/locations/http_protocol.py b/src/cloudflare/resources/radar/http/locations/http_protocol.py index 3c63e65d340..ea429e047a4 100644 --- a/src/cloudflare/resources/radar/http/locations/http_protocol.py +++ b/src/cloudflare/resources/radar/http/locations/http_protocol.py @@ -25,7 +25,8 @@ from ....._base_client import ( make_request_options, ) -from .....types.radar.http.locations import HTTPProtocolGetResponse, http_protocol_get_params +from .....types.radar.http.locations import http_protocol_get_params +from .....types.radar.http.locations.http_protocol_get_response import HTTPProtocolGetResponse __all__ = ["HTTPProtocol", "AsyncHTTPProtocol"] diff --git a/src/cloudflare/resources/radar/http/locations/ip_version.py b/src/cloudflare/resources/radar/http/locations/ip_version.py index 1eaeea5dd43..af02f689bc5 100644 --- a/src/cloudflare/resources/radar/http/locations/ip_version.py +++ b/src/cloudflare/resources/radar/http/locations/ip_version.py @@ -25,7 +25,8 @@ from ....._base_client import ( make_request_options, ) -from .....types.radar.http.locations import IPVersionGetResponse, ip_version_get_params +from .....types.radar.http.locations import ip_version_get_params +from .....types.radar.http.locations.ip_version_get_response import IPVersionGetResponse __all__ = ["IPVersion", "AsyncIPVersion"] diff --git a/src/cloudflare/resources/radar/http/locations/locations.py b/src/cloudflare/resources/radar/http/locations/locations.py index cbf4e5eb427..5cd6e5b0bd5 100644 --- a/src/cloudflare/resources/radar/http/locations/locations.py +++ b/src/cloudflare/resources/radar/http/locations/locations.py @@ -81,7 +81,8 @@ from ....._base_client import ( make_request_options, ) -from .....types.radar.http import LocationGetResponse, location_get_params +from .....types.radar.http import location_get_params +from .....types.radar.http.location_get_response import LocationGetResponse __all__ = ["Locations", "AsyncLocations"] diff --git a/src/cloudflare/resources/radar/http/locations/os.py b/src/cloudflare/resources/radar/http/locations/os.py index af747c2569b..0149e76e1dd 100644 --- a/src/cloudflare/resources/radar/http/locations/os.py +++ b/src/cloudflare/resources/radar/http/locations/os.py @@ -25,7 +25,8 @@ from ....._base_client import ( make_request_options, ) -from .....types.radar.http.locations import OSGetResponse, os_get_params +from .....types.radar.http.locations import os_get_params +from .....types.radar.http.locations.os_get_response import OSGetResponse __all__ = ["OS", "AsyncOS"] diff --git a/src/cloudflare/resources/radar/http/locations/tls_version.py b/src/cloudflare/resources/radar/http/locations/tls_version.py index 1f66f6c2933..c3b5b002cdc 100644 --- a/src/cloudflare/resources/radar/http/locations/tls_version.py +++ b/src/cloudflare/resources/radar/http/locations/tls_version.py @@ -25,7 +25,8 @@ from ....._base_client import ( make_request_options, ) -from .....types.radar.http.locations import TLSVersionGetResponse, tls_version_get_params +from .....types.radar.http.locations import tls_version_get_params +from .....types.radar.http.locations.tls_version_get_response import TLSVersionGetResponse __all__ = ["TLSVersion", "AsyncTLSVersion"] diff --git a/src/cloudflare/resources/radar/http/summary.py b/src/cloudflare/resources/radar/http/summary.py index d2b0b2af347..6f27db1e82d 100644 --- a/src/cloudflare/resources/radar/http/summary.py +++ b/src/cloudflare/resources/radar/http/summary.py @@ -26,13 +26,6 @@ make_request_options, ) from ....types.radar.http import ( - SummaryOSResponse, - SummaryBotClassResponse, - SummaryIPVersionResponse, - SummaryDeviceTypeResponse, - SummaryTLSVersionResponse, - SummaryHTTPVersionResponse, - SummaryHTTPProtocolResponse, summary_os_params, summary_bot_class_params, summary_ip_version_params, @@ -41,6 +34,13 @@ summary_http_version_params, summary_http_protocol_params, ) +from ....types.radar.http.summary_os_response import SummaryOSResponse +from ....types.radar.http.summary_bot_class_response import SummaryBotClassResponse +from ....types.radar.http.summary_ip_version_response import SummaryIPVersionResponse +from ....types.radar.http.summary_device_type_response import SummaryDeviceTypeResponse +from ....types.radar.http.summary_tls_version_response import SummaryTLSVersionResponse +from ....types.radar.http.summary_http_version_response import SummaryHTTPVersionResponse +from ....types.radar.http.summary_http_protocol_response import SummaryHTTPProtocolResponse __all__ = ["Summary", "AsyncSummary"] diff --git a/src/cloudflare/resources/radar/http/timeseries_groups.py b/src/cloudflare/resources/radar/http/timeseries_groups.py index 1988ffe899a..8e755201558 100644 --- a/src/cloudflare/resources/radar/http/timeseries_groups.py +++ b/src/cloudflare/resources/radar/http/timeseries_groups.py @@ -26,15 +26,6 @@ make_request_options, ) from ....types.radar.http import ( - TimeseriesGroupOSResponse, - TimeseriesGroupBrowserResponse, - TimeseriesGroupBotClassResponse, - TimeseriesGroupIPVersionResponse, - TimeseriesGroupDeviceTypeResponse, - TimeseriesGroupTLSVersionResponse, - TimeseriesGroupHTTPVersionResponse, - TimeseriesGroupHTTPProtocolResponse, - TimeseriesGroupBrowserFamilyResponse, timeseries_group_os_params, timeseries_group_browser_params, timeseries_group_bot_class_params, @@ -45,6 +36,15 @@ timeseries_group_http_protocol_params, timeseries_group_browser_family_params, ) +from ....types.radar.http.timeseries_group_os_response import TimeseriesGroupOSResponse +from ....types.radar.http.timeseries_group_browser_response import TimeseriesGroupBrowserResponse +from ....types.radar.http.timeseries_group_bot_class_response import TimeseriesGroupBotClassResponse +from ....types.radar.http.timeseries_group_ip_version_response import TimeseriesGroupIPVersionResponse +from ....types.radar.http.timeseries_group_device_type_response import TimeseriesGroupDeviceTypeResponse +from ....types.radar.http.timeseries_group_tls_version_response import TimeseriesGroupTLSVersionResponse +from ....types.radar.http.timeseries_group_http_version_response import TimeseriesGroupHTTPVersionResponse +from ....types.radar.http.timeseries_group_http_protocol_response import TimeseriesGroupHTTPProtocolResponse +from ....types.radar.http.timeseries_group_browser_family_response import TimeseriesGroupBrowserFamilyResponse __all__ = ["TimeseriesGroups", "AsyncTimeseriesGroups"] diff --git a/src/cloudflare/resources/radar/http/top.py b/src/cloudflare/resources/radar/http/top.py index 12d05bdd9f4..7c4624826a0 100644 --- a/src/cloudflare/resources/radar/http/top.py +++ b/src/cloudflare/resources/radar/http/top.py @@ -25,12 +25,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.radar.http import ( - TopBrowsersResponse, - TopBrowserFamiliesResponse, - top_browsers_params, - top_browser_families_params, -) +from ....types.radar.http import top_browsers_params, top_browser_families_params +from ....types.radar.http.top_browsers_response import TopBrowsersResponse +from ....types.radar.http.top_browser_families_response import TopBrowserFamiliesResponse __all__ = ["Top", "AsyncTop"] diff --git a/src/cloudflare/resources/radar/netflows/netflows.py b/src/cloudflare/resources/radar/netflows/netflows.py index fbb98cf941b..352f1618924 100644 --- a/src/cloudflare/resources/radar/netflows/netflows.py +++ b/src/cloudflare/resources/radar/netflows/netflows.py @@ -30,10 +30,11 @@ async_to_streamed_response_wrapper, ) from ...._wrappers import ResultWrapper -from ....types.radar import NetflowTimeseriesResponse, netflow_timeseries_params +from ....types.radar import netflow_timeseries_params from ...._base_client import ( make_request_options, ) +from ....types.radar.netflow_timeseries_response import NetflowTimeseriesResponse __all__ = ["Netflows", "AsyncNetflows"] diff --git a/src/cloudflare/resources/radar/netflows/top.py b/src/cloudflare/resources/radar/netflows/top.py index c6f7888fc3a..5655e1d60e9 100644 --- a/src/cloudflare/resources/radar/netflows/top.py +++ b/src/cloudflare/resources/radar/netflows/top.py @@ -25,7 +25,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.radar.netflows import TopAsesResponse, TopLocationsResponse, top_ases_params, top_locations_params +from ....types.radar.netflows import top_ases_params, top_locations_params +from ....types.radar.netflows.top_ases_response import TopAsesResponse +from ....types.radar.netflows.top_locations_response import TopLocationsResponse __all__ = ["Top", "AsyncTop"] diff --git a/src/cloudflare/resources/radar/quality/iqi.py b/src/cloudflare/resources/radar/quality/iqi.py index e0e406d13ef..89f9cb389ed 100644 --- a/src/cloudflare/resources/radar/quality/iqi.py +++ b/src/cloudflare/resources/radar/quality/iqi.py @@ -25,12 +25,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.radar.quality import ( - IQISummaryResponse, - IQITimeseriesGroupsResponse, - iqi_summary_params, - iqi_timeseries_groups_params, -) +from ....types.radar.quality import iqi_summary_params, iqi_timeseries_groups_params +from ....types.radar.quality.iqi_summary_response import IQISummaryResponse +from ....types.radar.quality.iqi_timeseries_groups_response import IQITimeseriesGroupsResponse __all__ = ["IQI", "AsyncIQI"] diff --git a/src/cloudflare/resources/radar/quality/speed/speed.py b/src/cloudflare/resources/radar/quality/speed/speed.py index ac3fb55efe1..7cfad9db9c8 100644 --- a/src/cloudflare/resources/radar/quality/speed/speed.py +++ b/src/cloudflare/resources/radar/quality/speed/speed.py @@ -33,12 +33,9 @@ from ....._base_client import ( make_request_options, ) -from .....types.radar.quality import ( - SpeedSummaryResponse, - SpeedHistogramResponse, - speed_summary_params, - speed_histogram_params, -) +from .....types.radar.quality import speed_summary_params, speed_histogram_params +from .....types.radar.quality.speed_summary_response import SpeedSummaryResponse +from .....types.radar.quality.speed_histogram_response import SpeedHistogramResponse __all__ = ["Speed", "AsyncSpeed"] diff --git a/src/cloudflare/resources/radar/quality/speed/top.py b/src/cloudflare/resources/radar/quality/speed/top.py index 721e7ac6984..f0222e87c33 100644 --- a/src/cloudflare/resources/radar/quality/speed/top.py +++ b/src/cloudflare/resources/radar/quality/speed/top.py @@ -25,7 +25,9 @@ from ....._base_client import ( make_request_options, ) -from .....types.radar.quality.speed import TopAsesResponse, TopLocationsResponse, top_ases_params, top_locations_params +from .....types.radar.quality.speed import top_ases_params, top_locations_params +from .....types.radar.quality.speed.top_ases_response import TopAsesResponse +from .....types.radar.quality.speed.top_locations_response import TopLocationsResponse __all__ = ["Top", "AsyncTop"] diff --git a/src/cloudflare/resources/radar/ranking/domain.py b/src/cloudflare/resources/radar/ranking/domain.py index 704104cd1cc..6c58fb3bf88 100644 --- a/src/cloudflare/resources/radar/ranking/domain.py +++ b/src/cloudflare/resources/radar/ranking/domain.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.radar.ranking import DomainGetResponse, domain_get_params +from ....types.radar.ranking import domain_get_params +from ....types.radar.ranking.domain_get_response import DomainGetResponse __all__ = ["Domain", "AsyncDomain"] diff --git a/src/cloudflare/resources/radar/ranking/ranking.py b/src/cloudflare/resources/radar/ranking/ranking.py index ed25c239862..7d50dd20e8a 100644 --- a/src/cloudflare/resources/radar/ranking/ranking.py +++ b/src/cloudflare/resources/radar/ranking/ranking.py @@ -30,15 +30,12 @@ async_to_streamed_response_wrapper, ) from ...._wrappers import ResultWrapper -from ....types.radar import ( - RankingTopResponse, - RankingTimeseriesGroupsResponse, - ranking_top_params, - ranking_timeseries_groups_params, -) +from ....types.radar import ranking_top_params, ranking_timeseries_groups_params from ...._base_client import ( make_request_options, ) +from ....types.radar.ranking_top_response import RankingTopResponse +from ....types.radar.ranking_timeseries_groups_response import RankingTimeseriesGroupsResponse __all__ = ["Ranking", "AsyncRanking"] diff --git a/src/cloudflare/resources/radar/search.py b/src/cloudflare/resources/radar/search.py index 22765f230c3..0921bc69760 100644 --- a/src/cloudflare/resources/radar/search.py +++ b/src/cloudflare/resources/radar/search.py @@ -21,10 +21,11 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.radar import SearchGlobalResponse, search_global_params +from ...types.radar import search_global_params from ..._base_client import ( make_request_options, ) +from ...types.radar.search_global_response import SearchGlobalResponse __all__ = ["Search", "AsyncSearch"] diff --git a/src/cloudflare/resources/radar/traffic_anomalies/locations.py b/src/cloudflare/resources/radar/traffic_anomalies/locations.py index b17e830b612..6b5b5f1fec9 100644 --- a/src/cloudflare/resources/radar/traffic_anomalies/locations.py +++ b/src/cloudflare/resources/radar/traffic_anomalies/locations.py @@ -25,7 +25,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.radar.traffic_anomalies import LocationGetResponse, location_get_params +from ....types.radar.traffic_anomalies import location_get_params +from ....types.radar.traffic_anomalies.location_get_response import LocationGetResponse __all__ = ["Locations", "AsyncLocations"] diff --git a/src/cloudflare/resources/radar/traffic_anomalies/traffic_anomalies.py b/src/cloudflare/resources/radar/traffic_anomalies/traffic_anomalies.py index 56ffdaa8e88..fd70ecf4c2a 100644 --- a/src/cloudflare/resources/radar/traffic_anomalies/traffic_anomalies.py +++ b/src/cloudflare/resources/radar/traffic_anomalies/traffic_anomalies.py @@ -30,10 +30,11 @@ async_to_streamed_response_wrapper, ) from ...._wrappers import ResultWrapper -from ....types.radar import TrafficAnomalyGetResponse, traffic_anomaly_get_params +from ....types.radar import traffic_anomaly_get_params from ...._base_client import ( make_request_options, ) +from ....types.radar.traffic_anomaly_get_response import TrafficAnomalyGetResponse __all__ = ["TrafficAnomalies", "AsyncTrafficAnomalies"] diff --git a/src/cloudflare/resources/radar/verified_bots/top.py b/src/cloudflare/resources/radar/verified_bots/top.py index 44a2df5aad4..84be76efc4b 100644 --- a/src/cloudflare/resources/radar/verified_bots/top.py +++ b/src/cloudflare/resources/radar/verified_bots/top.py @@ -25,7 +25,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.radar.verified_bots import TopBotsResponse, TopCategoriesResponse, top_bots_params, top_categories_params +from ....types.radar.verified_bots import top_bots_params, top_categories_params +from ....types.radar.verified_bots.top_bots_response import TopBotsResponse +from ....types.radar.verified_bots.top_categories_response import TopCategoriesResponse __all__ = ["Top", "AsyncTop"] diff --git a/src/cloudflare/resources/rate_limits.py b/src/cloudflare/resources/rate_limits.py index 9d7234568fe..d9a17782151 100644 --- a/src/cloudflare/resources/rate_limits.py +++ b/src/cloudflare/resources/rate_limits.py @@ -26,16 +26,16 @@ make_request_options, ) from ..types.rate_limits import ( - RateLimit, - RateLimitGetResponse, - RateLimitEditResponse, - RateLimitCreateResponse, - RateLimitDeleteResponse, rate_limit_edit_params, rate_limit_list_params, rate_limit_create_params, rate_limit_delete_params, ) +from ..types.rate_limits.rate_limit import RateLimit +from ..types.rate_limits.rate_limit_get_response import RateLimitGetResponse +from ..types.rate_limits.rate_limit_edit_response import RateLimitEditResponse +from ..types.rate_limits.rate_limit_create_response import RateLimitCreateResponse +from ..types.rate_limits.rate_limit_delete_response import RateLimitDeleteResponse __all__ = ["RateLimits", "AsyncRateLimits"] diff --git a/src/cloudflare/resources/rate_plans.py b/src/cloudflare/resources/rate_plans.py index 59066d4292e..9292d76f8da 100644 --- a/src/cloudflare/resources/rate_plans.py +++ b/src/cloudflare/resources/rate_plans.py @@ -19,7 +19,7 @@ from .._base_client import ( make_request_options, ) -from ..types.rate_plans import RatePlanGetResponse +from ..types.rate_plans.rate_plan_get_response import RatePlanGetResponse __all__ = ["RatePlans", "AsyncRatePlans"] diff --git a/src/cloudflare/resources/registrar/domains.py b/src/cloudflare/resources/registrar/domains.py index 154a146a6d2..9eaab04fdb3 100644 --- a/src/cloudflare/resources/registrar/domains.py +++ b/src/cloudflare/resources/registrar/domains.py @@ -25,7 +25,10 @@ AsyncPaginator, make_request_options, ) -from ...types.registrar import Domain, DomainGetResponse, DomainUpdateResponse, domain_update_params +from ...types.registrar import domain_update_params +from ...types.registrar.domain import Domain +from ...types.registrar.domain_get_response import DomainGetResponse +from ...types.registrar.domain_update_response import DomainUpdateResponse __all__ = ["Domains", "AsyncDomains"] diff --git a/src/cloudflare/resources/request_tracers/traces.py b/src/cloudflare/resources/request_tracers/traces.py index 581464ca254..ff37193a370 100644 --- a/src/cloudflare/resources/request_tracers/traces.py +++ b/src/cloudflare/resources/request_tracers/traces.py @@ -23,7 +23,8 @@ from ..._base_client import ( make_request_options, ) -from ...types.request_tracers import TraceCreateResponse, trace_create_params +from ...types.request_tracers import trace_create_params +from ...types.request_tracers.trace_create_response import TraceCreateResponse __all__ = ["Traces", "AsyncTraces"] diff --git a/src/cloudflare/resources/rules/lists/bulk_operations.py b/src/cloudflare/resources/rules/lists/bulk_operations.py index 34bb941cc26..9a1fdd25292 100644 --- a/src/cloudflare/resources/rules/lists/bulk_operations.py +++ b/src/cloudflare/resources/rules/lists/bulk_operations.py @@ -19,7 +19,7 @@ from ...._base_client import ( make_request_options, ) -from ....types.rules.lists import BulkOperationGetResponse +from ....types.rules.lists.bulk_operation_get_response import BulkOperationGetResponse __all__ = ["BulkOperations", "AsyncBulkOperations"] diff --git a/src/cloudflare/resources/rules/lists/items.py b/src/cloudflare/resources/rules/lists/items.py index 06b036efee2..ba6c3acad41 100644 --- a/src/cloudflare/resources/rules/lists/items.py +++ b/src/cloudflare/resources/rules/lists/items.py @@ -25,16 +25,11 @@ AsyncPaginator, make_request_options, ) -from ....types.rules.lists import ( - ItemGetResponse, - ItemCreateResponse, - ItemDeleteResponse, - ItemUpdateResponse, - item_list_params, - item_create_params, - item_delete_params, - item_update_params, -) +from ....types.rules.lists import item_list_params, item_create_params, item_delete_params, item_update_params +from ....types.rules.lists.item_get_response import ItemGetResponse +from ....types.rules.lists.item_create_response import ItemCreateResponse +from ....types.rules.lists.item_delete_response import ItemDeleteResponse +from ....types.rules.lists.item_update_response import ItemUpdateResponse __all__ = ["Items", "AsyncItems"] diff --git a/src/cloudflare/resources/rules/lists/lists.py b/src/cloudflare/resources/rules/lists/lists.py index 0e4274442fe..fdeaad2b90b 100644 --- a/src/cloudflare/resources/rules/lists/lists.py +++ b/src/cloudflare/resources/rules/lists/lists.py @@ -30,7 +30,7 @@ ) from ...._wrappers import ResultWrapper from ....pagination import SyncSinglePage, AsyncSinglePage -from ....types.rules import ListsList, ListDeleteResponse, list_create_params, list_delete_params, list_update_params +from ....types.rules import list_create_params, list_delete_params, list_update_params from ...._base_client import ( AsyncPaginator, make_request_options, @@ -43,6 +43,8 @@ BulkOperationsWithStreamingResponse, AsyncBulkOperationsWithStreamingResponse, ) +from ....types.rules.lists_list import ListsList +from ....types.rules.list_delete_response import ListDeleteResponse __all__ = ["Lists", "AsyncLists"] diff --git a/src/cloudflare/resources/rulesets/phases/phases.py b/src/cloudflare/resources/rulesets/phases/phases.py index 992e7a6f848..badc70c3a4d 100644 --- a/src/cloudflare/resources/rulesets/phases/phases.py +++ b/src/cloudflare/resources/rulesets/phases/phases.py @@ -32,7 +32,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.rulesets import PhaseGetResponse, PhaseUpdateResponse, phase_update_params +from ....types.rulesets import phase_update_params +from ....types.rulesets.phase_get_response import PhaseGetResponse +from ....types.rulesets.phase_update_response import PhaseUpdateResponse __all__ = ["Phases", "AsyncPhases"] diff --git a/src/cloudflare/resources/rulesets/phases/versions.py b/src/cloudflare/resources/rulesets/phases/versions.py index 5f304b78ce9..87341b6f03b 100644 --- a/src/cloudflare/resources/rulesets/phases/versions.py +++ b/src/cloudflare/resources/rulesets/phases/versions.py @@ -22,8 +22,8 @@ AsyncPaginator, make_request_options, ) -from ....types.rulesets import Ruleset -from ....types.rulesets.phases import VersionGetResponse +from ....types.rulesets.ruleset import Ruleset +from ....types.rulesets.phases.version_get_response import VersionGetResponse __all__ = ["Versions", "AsyncVersions"] diff --git a/src/cloudflare/resources/rulesets/rules.py b/src/cloudflare/resources/rulesets/rules.py index 8146924f218..e0a3deb382d 100644 --- a/src/cloudflare/resources/rulesets/rules.py +++ b/src/cloudflare/resources/rulesets/rules.py @@ -25,14 +25,11 @@ from ..._base_client import ( make_request_options, ) -from ...types.rulesets import ( - LoggingParam, - RuleEditResponse, - RuleCreateResponse, - RuleDeleteResponse, - rule_edit_params, - rule_create_params, -) +from ...types.rulesets import rule_edit_params, rule_create_params +from ...types.rulesets.logging_param import LoggingParam +from ...types.rulesets.rule_edit_response import RuleEditResponse +from ...types.rulesets.rule_create_response import RuleCreateResponse +from ...types.rulesets.rule_delete_response import RuleDeleteResponse __all__ = ["Rules", "AsyncRules"] diff --git a/src/cloudflare/resources/rulesets/rulesets.py b/src/cloudflare/resources/rulesets/rulesets.py index 68ff7a56b86..a9a20b2ee41 100644 --- a/src/cloudflare/resources/rulesets/rulesets.py +++ b/src/cloudflare/resources/rulesets/rulesets.py @@ -51,15 +51,12 @@ AsyncPaginator, make_request_options, ) -from ...types.rulesets import ( - Ruleset, - RulesetGetResponse, - RulesetCreateResponse, - RulesetUpdateResponse, - ruleset_create_params, - ruleset_update_params, -) +from ...types.rulesets import ruleset_create_params, ruleset_update_params from .versions.versions import Versions, AsyncVersions +from ...types.rulesets.ruleset import Ruleset +from ...types.rulesets.ruleset_get_response import RulesetGetResponse +from ...types.rulesets.ruleset_create_response import RulesetCreateResponse +from ...types.rulesets.ruleset_update_response import RulesetUpdateResponse __all__ = ["Rulesets", "AsyncRulesets"] diff --git a/src/cloudflare/resources/rulesets/versions/by_tag.py b/src/cloudflare/resources/rulesets/versions/by_tag.py index c53ca89d44e..450f2a96183 100644 --- a/src/cloudflare/resources/rulesets/versions/by_tag.py +++ b/src/cloudflare/resources/rulesets/versions/by_tag.py @@ -19,7 +19,7 @@ from ...._base_client import ( make_request_options, ) -from ....types.rulesets.versions import ByTagGetResponse +from ....types.rulesets.versions.by_tag_get_response import ByTagGetResponse __all__ = ["ByTag", "AsyncByTag"] diff --git a/src/cloudflare/resources/rulesets/versions/versions.py b/src/cloudflare/resources/rulesets/versions/versions.py index af3e75bef21..082e8518493 100644 --- a/src/cloudflare/resources/rulesets/versions/versions.py +++ b/src/cloudflare/resources/rulesets/versions/versions.py @@ -29,7 +29,8 @@ AsyncPaginator, make_request_options, ) -from ....types.rulesets import Ruleset, VersionGetResponse +from ....types.rulesets.ruleset import Ruleset +from ....types.rulesets.version_get_response import VersionGetResponse __all__ = ["Versions", "AsyncVersions"] diff --git a/src/cloudflare/resources/rum/rules.py b/src/cloudflare/resources/rum/rules.py index af00cb2c921..9b4836b741f 100644 --- a/src/cloudflare/resources/rum/rules.py +++ b/src/cloudflare/resources/rum/rules.py @@ -20,10 +20,13 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.rum import RUMRule, RuleListResponse, RuleDeleteResponse, rule_create_params, rule_update_params +from ...types.rum import rule_create_params, rule_update_params from ..._base_client import ( make_request_options, ) +from ...types.rum.rum_rule import RUMRule +from ...types.rum.rule_list_response import RuleListResponse +from ...types.rum.rule_delete_response import RuleDeleteResponse __all__ = ["Rules", "AsyncRules"] diff --git a/src/cloudflare/resources/rum/site_info.py b/src/cloudflare/resources/rum/site_info.py index 1836cb28840..4934aaff9ae 100644 --- a/src/cloudflare/resources/rum/site_info.py +++ b/src/cloudflare/resources/rum/site_info.py @@ -21,18 +21,14 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.rum import ( - Site, - SiteInfoDeleteResponse, - site_info_list_params, - site_info_create_params, - site_info_update_params, -) +from ...types.rum import site_info_list_params, site_info_create_params, site_info_update_params from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray from ..._base_client import ( AsyncPaginator, make_request_options, ) +from ...types.rum.site import Site +from ...types.rum.site_info_delete_response import SiteInfoDeleteResponse __all__ = ["SiteInfo", "AsyncSiteInfo"] diff --git a/src/cloudflare/resources/secondary_dns/acls.py b/src/cloudflare/resources/secondary_dns/acls.py index 4803b255160..9d8f81ebddb 100644 --- a/src/cloudflare/resources/secondary_dns/acls.py +++ b/src/cloudflare/resources/secondary_dns/acls.py @@ -25,7 +25,9 @@ AsyncPaginator, make_request_options, ) -from ...types.secondary_dns import ACL, ACLDeleteResponse, acl_create_params, acl_delete_params, acl_update_params +from ...types.secondary_dns import acl_create_params, acl_delete_params, acl_update_params +from ...types.secondary_dns.acl import ACL +from ...types.secondary_dns.acl_delete_response import ACLDeleteResponse __all__ = ["ACLs", "AsyncACLs"] diff --git a/src/cloudflare/resources/secondary_dns/force_axfr.py b/src/cloudflare/resources/secondary_dns/force_axfr.py index cff61b7c3e7..406f15e5108 100644 --- a/src/cloudflare/resources/secondary_dns/force_axfr.py +++ b/src/cloudflare/resources/secondary_dns/force_axfr.py @@ -23,7 +23,8 @@ from ..._base_client import ( make_request_options, ) -from ...types.secondary_dns import ForceAXFR, force_axfr_create_params +from ...types.secondary_dns import force_axfr_create_params +from ...types.secondary_dns.force_axfr import ForceAXFR __all__ = ["ForceAXFRResource", "AsyncForceAXFRResource"] diff --git a/src/cloudflare/resources/secondary_dns/incoming.py b/src/cloudflare/resources/secondary_dns/incoming.py index f6cf2aa8aa7..6d5bc100692 100644 --- a/src/cloudflare/resources/secondary_dns/incoming.py +++ b/src/cloudflare/resources/secondary_dns/incoming.py @@ -23,15 +23,11 @@ from ..._base_client import ( make_request_options, ) -from ...types.secondary_dns import ( - IncomingGetResponse, - IncomingCreateResponse, - IncomingDeleteResponse, - IncomingUpdateResponse, - incoming_create_params, - incoming_delete_params, - incoming_update_params, -) +from ...types.secondary_dns import incoming_create_params, incoming_delete_params, incoming_update_params +from ...types.secondary_dns.incoming_get_response import IncomingGetResponse +from ...types.secondary_dns.incoming_create_response import IncomingCreateResponse +from ...types.secondary_dns.incoming_delete_response import IncomingDeleteResponse +from ...types.secondary_dns.incoming_update_response import IncomingUpdateResponse __all__ = ["IncomingResource", "AsyncIncomingResource"] diff --git a/src/cloudflare/resources/secondary_dns/outgoing/outgoing.py b/src/cloudflare/resources/secondary_dns/outgoing/outgoing.py index 2cf2647f484..0ae69fd33e0 100644 --- a/src/cloudflare/resources/secondary_dns/outgoing/outgoing.py +++ b/src/cloudflare/resources/secondary_dns/outgoing/outgoing.py @@ -32,13 +32,6 @@ make_request_options, ) from ....types.secondary_dns import ( - EnableTransfer, - DisableTransfer, - OutgoingGetResponse, - OutgoingCreateResponse, - OutgoingDeleteResponse, - OutgoingUpdateResponse, - OutgoingForceNotifyResponse, outgoing_create_params, outgoing_delete_params, outgoing_enable_params, @@ -46,6 +39,13 @@ outgoing_disable_params, outgoing_force_notify_params, ) +from ....types.secondary_dns.enable_transfer import EnableTransfer +from ....types.secondary_dns.disable_transfer import DisableTransfer +from ....types.secondary_dns.outgoing_get_response import OutgoingGetResponse +from ....types.secondary_dns.outgoing_create_response import OutgoingCreateResponse +from ....types.secondary_dns.outgoing_delete_response import OutgoingDeleteResponse +from ....types.secondary_dns.outgoing_update_response import OutgoingUpdateResponse +from ....types.secondary_dns.outgoing_force_notify_response import OutgoingForceNotifyResponse __all__ = ["OutgoingResource", "AsyncOutgoingResource"] diff --git a/src/cloudflare/resources/secondary_dns/outgoing/status.py b/src/cloudflare/resources/secondary_dns/outgoing/status.py index a0b2e3b4376..73b73af6d91 100644 --- a/src/cloudflare/resources/secondary_dns/outgoing/status.py +++ b/src/cloudflare/resources/secondary_dns/outgoing/status.py @@ -19,7 +19,7 @@ from ...._base_client import ( make_request_options, ) -from ....types.secondary_dns import EnableTransfer +from ....types.secondary_dns.enable_transfer import EnableTransfer __all__ = ["Status", "AsyncStatus"] diff --git a/src/cloudflare/resources/secondary_dns/peers.py b/src/cloudflare/resources/secondary_dns/peers.py index 34790b6a8bf..10826909f0a 100644 --- a/src/cloudflare/resources/secondary_dns/peers.py +++ b/src/cloudflare/resources/secondary_dns/peers.py @@ -25,7 +25,9 @@ AsyncPaginator, make_request_options, ) -from ...types.secondary_dns import Peer, PeerDeleteResponse, peer_create_params, peer_delete_params, peer_update_params +from ...types.secondary_dns import peer_create_params, peer_delete_params, peer_update_params +from ...types.secondary_dns.peer import Peer +from ...types.secondary_dns.peer_delete_response import PeerDeleteResponse __all__ = ["Peers", "AsyncPeers"] diff --git a/src/cloudflare/resources/secondary_dns/tsigs.py b/src/cloudflare/resources/secondary_dns/tsigs.py index 905c6a2f947..0deebd8b9e8 100644 --- a/src/cloudflare/resources/secondary_dns/tsigs.py +++ b/src/cloudflare/resources/secondary_dns/tsigs.py @@ -25,7 +25,9 @@ AsyncPaginator, make_request_options, ) -from ...types.secondary_dns import TSIG, TSIGDeleteResponse, tsig_create_params, tsig_delete_params, tsig_update_params +from ...types.secondary_dns import tsig_create_params, tsig_delete_params, tsig_update_params +from ...types.secondary_dns.tsig import TSIG +from ...types.secondary_dns.tsig_delete_response import TSIGDeleteResponse __all__ = ["TSIGs", "AsyncTSIGs"] diff --git a/src/cloudflare/resources/snippets/rules.py b/src/cloudflare/resources/snippets/rules.py index 305c64467c7..133232589cd 100644 --- a/src/cloudflare/resources/snippets/rules.py +++ b/src/cloudflare/resources/snippets/rules.py @@ -25,7 +25,9 @@ AsyncPaginator, make_request_options, ) -from ...types.snippets import RuleListResponse, RuleUpdateResponse, rule_update_params +from ...types.snippets import rule_update_params +from ...types.snippets.rule_list_response import RuleListResponse +from ...types.snippets.rule_update_response import RuleUpdateResponse __all__ = ["Rules", "AsyncRules"] diff --git a/src/cloudflare/resources/snippets/snippets.py b/src/cloudflare/resources/snippets/snippets.py index 74fd3f52db8..09597d8582b 100644 --- a/src/cloudflare/resources/snippets/snippets.py +++ b/src/cloudflare/resources/snippets/snippets.py @@ -41,7 +41,9 @@ AsyncPaginator, make_request_options, ) -from ...types.snippets import Snippet, SnippetDeleteResponse, snippet_update_params +from ...types.snippets import snippet_update_params +from ...types.snippets.snippet import Snippet +from ...types.snippets.snippet_delete_response import SnippetDeleteResponse __all__ = ["Snippets", "AsyncSnippets"] diff --git a/src/cloudflare/resources/spectrum/analytics/aggregates/currents.py b/src/cloudflare/resources/spectrum/analytics/aggregates/currents.py index 713fd133635..fe591cf6463 100644 --- a/src/cloudflare/resources/spectrum/analytics/aggregates/currents.py +++ b/src/cloudflare/resources/spectrum/analytics/aggregates/currents.py @@ -23,7 +23,8 @@ from ....._base_client import ( make_request_options, ) -from .....types.spectrum.analytics.aggregates import CurrentGetResponse, current_get_params +from .....types.spectrum.analytics.aggregates import current_get_params +from .....types.spectrum.analytics.aggregates.current_get_response import CurrentGetResponse __all__ = ["Currents", "AsyncCurrents"] diff --git a/src/cloudflare/resources/spectrum/analytics/events/bytimes.py b/src/cloudflare/resources/spectrum/analytics/events/bytimes.py index c4ef41348c1..f6b80edfa8c 100644 --- a/src/cloudflare/resources/spectrum/analytics/events/bytimes.py +++ b/src/cloudflare/resources/spectrum/analytics/events/bytimes.py @@ -25,8 +25,9 @@ from ....._base_client import ( make_request_options, ) -from .....types.spectrum.analytics import Dimension -from .....types.spectrum.analytics.events import BytimeGetResponse, bytime_get_params +from .....types.spectrum.analytics.events import bytime_get_params +from .....types.spectrum.analytics.dimension import Dimension +from .....types.spectrum.analytics.events.bytime_get_response import BytimeGetResponse __all__ = ["Bytimes", "AsyncBytimes"] diff --git a/src/cloudflare/resources/spectrum/analytics/events/summaries.py b/src/cloudflare/resources/spectrum/analytics/events/summaries.py index 71cf69f7774..ab7f9cd19f1 100644 --- a/src/cloudflare/resources/spectrum/analytics/events/summaries.py +++ b/src/cloudflare/resources/spectrum/analytics/events/summaries.py @@ -25,8 +25,9 @@ from ....._base_client import ( make_request_options, ) -from .....types.spectrum.analytics import Dimension -from .....types.spectrum.analytics.events import SummaryGetResponse, summary_get_params +from .....types.spectrum.analytics.events import summary_get_params +from .....types.spectrum.analytics.dimension import Dimension +from .....types.spectrum.analytics.events.summary_get_response import SummaryGetResponse __all__ = ["Summaries", "AsyncSummaries"] diff --git a/src/cloudflare/resources/spectrum/apps.py b/src/cloudflare/resources/spectrum/apps.py index 5893a6165f1..5339b578b31 100644 --- a/src/cloudflare/resources/spectrum/apps.py +++ b/src/cloudflare/resources/spectrum/apps.py @@ -27,19 +27,19 @@ make_request_options, ) from ...types.spectrum import ( - DNSParam, - EdgeIPsParam, - AppGetResponse, - OriginDNSParam, - OriginPortParam, - AppCreateResponse, - AppDeleteResponse, - AppUpdateResponse, app_list_params, app_create_params, app_delete_params, app_update_params, ) +from ...types.spectrum.dns_param import DNSParam +from ...types.spectrum.edge_ips_param import EdgeIPsParam +from ...types.spectrum.app_get_response import AppGetResponse +from ...types.spectrum.origin_dns_param import OriginDNSParam +from ...types.spectrum.origin_port_param import OriginPortParam +from ...types.spectrum.app_create_response import AppCreateResponse +from ...types.spectrum.app_delete_response import AppDeleteResponse +from ...types.spectrum.app_update_response import AppUpdateResponse __all__ = ["Apps", "AsyncApps"] diff --git a/src/cloudflare/resources/speed/availabilities.py b/src/cloudflare/resources/speed/availabilities.py index 26c92fa4fd2..fadf178dfa1 100644 --- a/src/cloudflare/resources/speed/availabilities.py +++ b/src/cloudflare/resources/speed/availabilities.py @@ -16,10 +16,10 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.speed import Availability from ..._base_client import ( make_request_options, ) +from ...types.speed.availability import Availability __all__ = ["Availabilities", "AsyncAvailabilities"] diff --git a/src/cloudflare/resources/speed/pages.py b/src/cloudflare/resources/speed/pages.py index 97ec103cef3..db93f74c908 100644 --- a/src/cloudflare/resources/speed/pages.py +++ b/src/cloudflare/resources/speed/pages.py @@ -14,11 +14,11 @@ async_to_streamed_response_wrapper, ) from ...pagination import SyncSinglePage, AsyncSinglePage -from ...types.speed import PageListResponse from ..._base_client import ( AsyncPaginator, make_request_options, ) +from ...types.speed.page_list_response import PageListResponse __all__ = ["Pages", "AsyncPages"] diff --git a/src/cloudflare/resources/speed/schedule.py b/src/cloudflare/resources/speed/schedule.py index a4108b2c79b..44ab5e60ffc 100644 --- a/src/cloudflare/resources/speed/schedule.py +++ b/src/cloudflare/resources/speed/schedule.py @@ -21,10 +21,11 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.speed import ScheduleCreateResponse, schedule_create_params +from ...types.speed import schedule_create_params from ..._base_client import ( make_request_options, ) +from ...types.speed.schedule_create_response import ScheduleCreateResponse __all__ = ["ScheduleResource", "AsyncScheduleResource"] diff --git a/src/cloudflare/resources/speed/speed.py b/src/cloudflare/resources/speed/speed.py index a61146d7bf6..771f60241b2 100644 --- a/src/cloudflare/resources/speed/speed.py +++ b/src/cloudflare/resources/speed/speed.py @@ -46,14 +46,7 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.speed import ( - Trend, - Schedule, - SpeedDeleteResponse, - speed_delete_params, - speed_trends_list_params, - speed_schedule_get_params, -) +from ...types.speed import speed_delete_params, speed_trends_list_params, speed_schedule_get_params from ..._base_client import ( make_request_options, ) @@ -65,6 +58,9 @@ AvailabilitiesWithStreamingResponse, AsyncAvailabilitiesWithStreamingResponse, ) +from ...types.speed.trend import Trend +from ...types.speed.schedule import Schedule +from ...types.speed.speed_delete_response import SpeedDeleteResponse __all__ = ["Speed", "AsyncSpeed"] diff --git a/src/cloudflare/resources/speed/tests.py b/src/cloudflare/resources/speed/tests.py index a2a1063f96e..c83be2d06b7 100644 --- a/src/cloudflare/resources/speed/tests.py +++ b/src/cloudflare/resources/speed/tests.py @@ -21,17 +21,13 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.speed import ( - Test, - TestListResponse, - TestDeleteResponse, - test_list_params, - test_create_params, - test_delete_params, -) +from ...types.speed import test_list_params, test_create_params, test_delete_params from ..._base_client import ( make_request_options, ) +from ...types.speed.test import Test +from ...types.speed.test_list_response import TestListResponse +from ...types.speed.test_delete_response import TestDeleteResponse __all__ = ["Tests", "AsyncTests"] diff --git a/src/cloudflare/resources/ssl/analyze.py b/src/cloudflare/resources/ssl/analyze.py index 5456cd97718..3c48547333f 100644 --- a/src/cloudflare/resources/ssl/analyze.py +++ b/src/cloudflare/resources/ssl/analyze.py @@ -20,11 +20,13 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.ssl import AnalyzeCreateResponse, analyze_create_params +from ...types.ssl import analyze_create_params from ..._base_client import ( make_request_options, ) from ...types.custom_hostnames import BundleMethod +from ...types.ssl.analyze_create_response import AnalyzeCreateResponse +from ...types.custom_hostnames.bundle_method import BundleMethod __all__ = ["Analyze", "AsyncAnalyze"] diff --git a/src/cloudflare/resources/ssl/certificate_packs/certificate_packs.py b/src/cloudflare/resources/ssl/certificate_packs/certificate_packs.py index 43ea6be64f4..2cd0d594e9b 100644 --- a/src/cloudflare/resources/ssl/certificate_packs/certificate_packs.py +++ b/src/cloudflare/resources/ssl/certificate_packs/certificate_packs.py @@ -37,19 +37,15 @@ async_to_streamed_response_wrapper, ) from ...._wrappers import ResultWrapper -from ....types.ssl import ( - CertificatePackGetResponse, - CertificatePackEditResponse, - CertificatePackDeleteResponse, - certificate_pack_edit_params, - certificate_pack_list_params, - certificate_pack_delete_params, -) +from ....types.ssl import certificate_pack_edit_params, certificate_pack_list_params, certificate_pack_delete_params from ....pagination import SyncSinglePage, AsyncSinglePage from ...._base_client import ( AsyncPaginator, make_request_options, ) +from ....types.ssl.certificate_pack_get_response import CertificatePackGetResponse +from ....types.ssl.certificate_pack_edit_response import CertificatePackEditResponse +from ....types.ssl.certificate_pack_delete_response import CertificatePackDeleteResponse __all__ = ["CertificatePacks", "AsyncCertificatePacks"] diff --git a/src/cloudflare/resources/ssl/certificate_packs/order.py b/src/cloudflare/resources/ssl/certificate_packs/order.py index 776dad1618a..c4b551a1614 100644 --- a/src/cloudflare/resources/ssl/certificate_packs/order.py +++ b/src/cloudflare/resources/ssl/certificate_packs/order.py @@ -21,11 +21,12 @@ async_to_streamed_response_wrapper, ) from ...._wrappers import ResultWrapper -from ....types.ssl import Host from ...._base_client import ( make_request_options, ) -from ....types.ssl.certificate_packs import OrderCreateResponse, order_create_params +from ....types.ssl.host import Host +from ....types.ssl.certificate_packs import order_create_params +from ....types.ssl.certificate_packs.order_create_response import OrderCreateResponse __all__ = ["Order", "AsyncOrder"] diff --git a/src/cloudflare/resources/ssl/certificate_packs/quota.py b/src/cloudflare/resources/ssl/certificate_packs/quota.py index b4696cf4a0b..7497b104459 100644 --- a/src/cloudflare/resources/ssl/certificate_packs/quota.py +++ b/src/cloudflare/resources/ssl/certificate_packs/quota.py @@ -19,7 +19,7 @@ from ...._base_client import ( make_request_options, ) -from ....types.ssl.certificate_packs import QuotaGetResponse +from ....types.ssl.certificate_packs.quota_get_response import QuotaGetResponse __all__ = ["Quota", "AsyncQuota"] diff --git a/src/cloudflare/resources/ssl/recommendations.py b/src/cloudflare/resources/ssl/recommendations.py index 3d36236a96f..23fec507115 100644 --- a/src/cloudflare/resources/ssl/recommendations.py +++ b/src/cloudflare/resources/ssl/recommendations.py @@ -16,10 +16,10 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.ssl import RecommendationGetResponse from ..._base_client import ( make_request_options, ) +from ...types.ssl.recommendation_get_response import RecommendationGetResponse __all__ = ["Recommendations", "AsyncRecommendations"] diff --git a/src/cloudflare/resources/ssl/universal/settings.py b/src/cloudflare/resources/ssl/universal/settings.py index d7bfd1a6906..e00c363a2ea 100644 --- a/src/cloudflare/resources/ssl/universal/settings.py +++ b/src/cloudflare/resources/ssl/universal/settings.py @@ -23,7 +23,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.ssl.universal import UniversalSSLSettings, setting_edit_params +from ....types.ssl.universal import setting_edit_params +from ....types.ssl.universal.universal_ssl_settings import UniversalSSLSettings __all__ = ["Settings", "AsyncSettings"] diff --git a/src/cloudflare/resources/ssl/verification.py b/src/cloudflare/resources/ssl/verification.py index 68b8683941e..d55186e3bb5 100644 --- a/src/cloudflare/resources/ssl/verification.py +++ b/src/cloudflare/resources/ssl/verification.py @@ -21,15 +21,12 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.ssl import ( - VerificationGetResponse, - VerificationEditResponse, - verification_get_params, - verification_edit_params, -) +from ...types.ssl import verification_get_params, verification_edit_params from ..._base_client import ( make_request_options, ) +from ...types.ssl.verification_get_response import VerificationGetResponse +from ...types.ssl.verification_edit_response import VerificationEditResponse __all__ = ["VerificationResource", "AsyncVerificationResource"] diff --git a/src/cloudflare/resources/storage/analytics.py b/src/cloudflare/resources/storage/analytics.py index 9fa811fee5d..da6734a135d 100644 --- a/src/cloudflare/resources/storage/analytics.py +++ b/src/cloudflare/resources/storage/analytics.py @@ -23,7 +23,9 @@ from ..._base_client import ( make_request_options, ) -from ...types.storage import Schema, Components, analytics_list_params, analytics_stored_params +from ...types.storage import analytics_list_params, analytics_stored_params +from ...types.storage.schema import Schema +from ...types.storage.components import Components __all__ = ["Analytics", "AsyncAnalytics"] diff --git a/src/cloudflare/resources/stream/audio_tracks.py b/src/cloudflare/resources/stream/audio_tracks.py index b613b75c64d..77e48544415 100644 --- a/src/cloudflare/resources/stream/audio_tracks.py +++ b/src/cloudflare/resources/stream/audio_tracks.py @@ -23,13 +23,10 @@ from ..._base_client import ( make_request_options, ) -from ...types.stream import ( - Audio, - AudioTrackGetResponse, - AudioTrackDeleteResponse, - audio_track_copy_params, - audio_track_edit_params, -) +from ...types.stream import audio_track_copy_params, audio_track_edit_params +from ...types.stream.audio import Audio +from ...types.stream.audio_track_get_response import AudioTrackGetResponse +from ...types.stream.audio_track_delete_response import AudioTrackDeleteResponse __all__ = ["AudioTracks", "AsyncAudioTracks"] diff --git a/src/cloudflare/resources/stream/captions/captions.py b/src/cloudflare/resources/stream/captions/captions.py index 429849b28d2..8b69f48e3e5 100644 --- a/src/cloudflare/resources/stream/captions/captions.py +++ b/src/cloudflare/resources/stream/captions/captions.py @@ -27,8 +27,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.stream import CaptionGetResponse from .language.language import Language, AsyncLanguage +from ....types.stream.caption_get_response import CaptionGetResponse __all__ = ["Captions", "AsyncCaptions"] diff --git a/src/cloudflare/resources/stream/captions/language/language.py b/src/cloudflare/resources/stream/captions/language/language.py index 3e238b202d2..7ef38418e82 100644 --- a/src/cloudflare/resources/stream/captions/language/language.py +++ b/src/cloudflare/resources/stream/captions/language/language.py @@ -31,8 +31,9 @@ from ....._base_client import ( make_request_options, ) -from .....types.stream import Caption -from .....types.stream.captions import LanguageDeleteResponse, language_delete_params, language_update_params +from .....types.stream.caption import Caption +from .....types.stream.captions import language_delete_params, language_update_params +from .....types.stream.captions.language_delete_response import LanguageDeleteResponse __all__ = ["Language", "AsyncLanguage"] diff --git a/src/cloudflare/resources/stream/clip.py b/src/cloudflare/resources/stream/clip.py index f5cefb04f50..9c34d5ab4aa 100644 --- a/src/cloudflare/resources/stream/clip.py +++ b/src/cloudflare/resources/stream/clip.py @@ -23,7 +23,9 @@ from ..._base_client import ( make_request_options, ) -from ...types.stream import Clip, AllowedOrigins, clip_create_params +from ...types.stream import clip_create_params +from ...types.stream.clip import Clip +from ...types.stream.allowed_origins import AllowedOrigins __all__ = ["ClipResource", "AsyncClipResource"] diff --git a/src/cloudflare/resources/stream/copy.py b/src/cloudflare/resources/stream/copy.py index 12473d6b34c..16c1e796ec2 100644 --- a/src/cloudflare/resources/stream/copy.py +++ b/src/cloudflare/resources/stream/copy.py @@ -24,7 +24,9 @@ from ..._base_client import ( make_request_options, ) -from ...types.stream import Video, AllowedOrigins, copy_create_params +from ...types.stream import copy_create_params +from ...types.stream.video import Video +from ...types.stream.allowed_origins import AllowedOrigins __all__ = ["Copy", "AsyncCopy"] diff --git a/src/cloudflare/resources/stream/direct_upload.py b/src/cloudflare/resources/stream/direct_upload.py index 11faf11b0bd..1bedca2a14a 100644 --- a/src/cloudflare/resources/stream/direct_upload.py +++ b/src/cloudflare/resources/stream/direct_upload.py @@ -24,7 +24,9 @@ from ..._base_client import ( make_request_options, ) -from ...types.stream import AllowedOrigins, DirectUploadCreateResponse, direct_upload_create_params +from ...types.stream import direct_upload_create_params +from ...types.stream.allowed_origins import AllowedOrigins +from ...types.stream.direct_upload_create_response import DirectUploadCreateResponse __all__ = ["DirectUpload", "AsyncDirectUpload"] diff --git a/src/cloudflare/resources/stream/downloads.py b/src/cloudflare/resources/stream/downloads.py index ebc1a9c1243..386f5695ff2 100644 --- a/src/cloudflare/resources/stream/downloads.py +++ b/src/cloudflare/resources/stream/downloads.py @@ -23,7 +23,10 @@ from ..._base_client import ( make_request_options, ) -from ...types.stream import DownloadGetResponse, DownloadCreateResponse, DownloadDeleteResponse, download_create_params +from ...types.stream import download_create_params +from ...types.stream.download_get_response import DownloadGetResponse +from ...types.stream.download_create_response import DownloadCreateResponse +from ...types.stream.download_delete_response import DownloadDeleteResponse __all__ = ["Downloads", "AsyncDownloads"] diff --git a/src/cloudflare/resources/stream/keys.py b/src/cloudflare/resources/stream/keys.py index 0a71a10dba2..50326e7ad0d 100644 --- a/src/cloudflare/resources/stream/keys.py +++ b/src/cloudflare/resources/stream/keys.py @@ -23,7 +23,9 @@ from ..._base_client import ( make_request_options, ) -from ...types.stream import KeyGetResponse, KeyDeleteResponse, keys, key_create_params, key_delete_params +from ...types.stream import keys, key_create_params, key_delete_params +from ...types.stream.key_get_response import KeyGetResponse +from ...types.stream.key_delete_response import KeyDeleteResponse __all__ = ["Keys", "AsyncKeys"] diff --git a/src/cloudflare/resources/stream/live_inputs/live_inputs.py b/src/cloudflare/resources/stream/live_inputs/live_inputs.py index 4a1b4152fbb..b44746d2522 100644 --- a/src/cloudflare/resources/stream/live_inputs/live_inputs.py +++ b/src/cloudflare/resources/stream/live_inputs/live_inputs.py @@ -32,13 +32,13 @@ make_request_options, ) from ....types.stream import ( - LiveInput, - LiveInputListResponse, live_input_list_params, live_input_create_params, live_input_delete_params, live_input_update_params, ) +from ....types.stream.live_input import LiveInput +from ....types.stream.live_input_list_response import LiveInputListResponse __all__ = ["LiveInputs", "AsyncLiveInputs"] diff --git a/src/cloudflare/resources/stream/live_inputs/outputs.py b/src/cloudflare/resources/stream/live_inputs/outputs.py index 6e6651a73c9..c587ca8a7cf 100644 --- a/src/cloudflare/resources/stream/live_inputs/outputs.py +++ b/src/cloudflare/resources/stream/live_inputs/outputs.py @@ -25,7 +25,8 @@ AsyncPaginator, make_request_options, ) -from ....types.stream.live_inputs import Output, output_create_params, output_delete_params, output_update_params +from ....types.stream.live_inputs import output_create_params, output_delete_params, output_update_params +from ....types.stream.live_inputs.output import Output __all__ = ["Outputs", "AsyncOutputs"] diff --git a/src/cloudflare/resources/stream/stream.py b/src/cloudflare/resources/stream/stream.py index af8a0c513a3..373350bf8fa 100644 --- a/src/cloudflare/resources/stream/stream.py +++ b/src/cloudflare/resources/stream/stream.py @@ -131,8 +131,9 @@ AsyncPaginator, make_request_options, ) -from ...types.stream import Video, stream_list_params, stream_create_params, stream_delete_params +from ...types.stream import stream_list_params, stream_create_params, stream_delete_params from .captions.captions import Captions, AsyncCaptions +from ...types.stream.video import Video from .live_inputs.live_inputs import LiveInputs, AsyncLiveInputs __all__ = ["Stream", "AsyncStream"] diff --git a/src/cloudflare/resources/stream/token.py b/src/cloudflare/resources/stream/token.py index 5c639c836b8..575f238fabb 100644 --- a/src/cloudflare/resources/stream/token.py +++ b/src/cloudflare/resources/stream/token.py @@ -23,7 +23,8 @@ from ..._base_client import ( make_request_options, ) -from ...types.stream import TokenCreateResponse, token_create_params +from ...types.stream import token_create_params +from ...types.stream.token_create_response import TokenCreateResponse __all__ = ["Token", "AsyncToken"] diff --git a/src/cloudflare/resources/stream/videos.py b/src/cloudflare/resources/stream/videos.py index 5303406261a..daa30c78b3a 100644 --- a/src/cloudflare/resources/stream/videos.py +++ b/src/cloudflare/resources/stream/videos.py @@ -23,7 +23,8 @@ from ..._base_client import ( make_request_options, ) -from ...types.stream import VideoStorageUsageResponse, video_storage_usage_params +from ...types.stream import video_storage_usage_params +from ...types.stream.video_storage_usage_response import VideoStorageUsageResponse __all__ = ["Videos", "AsyncVideos"] diff --git a/src/cloudflare/resources/stream/watermarks.py b/src/cloudflare/resources/stream/watermarks.py index 48d1b21daf2..7598e93943a 100644 --- a/src/cloudflare/resources/stream/watermarks.py +++ b/src/cloudflare/resources/stream/watermarks.py @@ -25,7 +25,9 @@ AsyncPaginator, make_request_options, ) -from ...types.stream import Watermark, WatermarkDeleteResponse, watermark_create_params, watermark_delete_params +from ...types.stream import watermark_create_params, watermark_delete_params +from ...types.stream.watermark import Watermark +from ...types.stream.watermark_delete_response import WatermarkDeleteResponse __all__ = ["Watermarks", "AsyncWatermarks"] diff --git a/src/cloudflare/resources/stream/webhooks.py b/src/cloudflare/resources/stream/webhooks.py index d80163ee6db..b3ac0a6cd4e 100644 --- a/src/cloudflare/resources/stream/webhooks.py +++ b/src/cloudflare/resources/stream/webhooks.py @@ -23,13 +23,10 @@ from ..._base_client import ( make_request_options, ) -from ...types.stream import ( - WebhookGetResponse, - WebhookDeleteResponse, - WebhookUpdateResponse, - webhook_delete_params, - webhook_update_params, -) +from ...types.stream import webhook_delete_params, webhook_update_params +from ...types.stream.webhook_get_response import WebhookGetResponse +from ...types.stream.webhook_delete_response import WebhookDeleteResponse +from ...types.stream.webhook_update_response import WebhookUpdateResponse __all__ = ["Webhooks", "AsyncWebhooks"] diff --git a/src/cloudflare/resources/subscriptions.py b/src/cloudflare/resources/subscriptions.py index e46c6f67a37..24eb7c40bbd 100644 --- a/src/cloudflare/resources/subscriptions.py +++ b/src/cloudflare/resources/subscriptions.py @@ -22,25 +22,19 @@ ) from .._wrappers import ResultWrapper from ..pagination import SyncSinglePage, AsyncSinglePage -from ..types.user import ( - Subscription, - RatePlanParam, - SubscriptionZoneParam, - SubscriptionComponentParam, -) from .._base_client import ( AsyncPaginator, make_request_options, ) -from ..types.subscriptions import ( - SubscriptionGetResponse, - SubscriptionCreateResponse, - SubscriptionDeleteResponse, - SubscriptionUpdateResponse, - subscription_create_params, - subscription_delete_params, - subscription_update_params, -) +from ..types.subscriptions import subscription_create_params, subscription_delete_params, subscription_update_params +from ..types.user.subscription import Subscription +from ..types.user.rate_plan_param import RatePlanParam +from ..types.user.subscription_zone_param import SubscriptionZoneParam +from ..types.user.subscription_component_param import SubscriptionComponentParam +from ..types.subscriptions.subscription_get_response import SubscriptionGetResponse +from ..types.subscriptions.subscription_create_response import SubscriptionCreateResponse +from ..types.subscriptions.subscription_delete_response import SubscriptionDeleteResponse +from ..types.subscriptions.subscription_update_response import SubscriptionUpdateResponse __all__ = ["Subscriptions", "AsyncSubscriptions"] diff --git a/src/cloudflare/resources/url_normalization.py b/src/cloudflare/resources/url_normalization.py index e9128e15259..7d49849c932 100644 --- a/src/cloudflare/resources/url_normalization.py +++ b/src/cloudflare/resources/url_normalization.py @@ -20,11 +20,9 @@ from .._base_client import ( make_request_options, ) -from ..types.url_normalization import ( - URLNormalizationGetResponse, - URLNormalizationUpdateResponse, - url_normalization_update_params, -) +from ..types.url_normalization import url_normalization_update_params +from ..types.url_normalization.url_normalization_get_response import URLNormalizationGetResponse +from ..types.url_normalization.url_normalization_update_response import URLNormalizationUpdateResponse __all__ = ["URLNormalization", "AsyncURLNormalization"] diff --git a/src/cloudflare/resources/url_scanner/scans.py b/src/cloudflare/resources/url_scanner/scans.py index 1db03ccdbf8..396e353d21b 100644 --- a/src/cloudflare/resources/url_scanner/scans.py +++ b/src/cloudflare/resources/url_scanner/scans.py @@ -32,13 +32,10 @@ from ..._base_client import ( make_request_options, ) -from ...types.url_scanner import ( - ScanGetResponse, - ScanHarResponse, - ScanCreateResponse, - scan_create_params, - scan_screenshot_params, -) +from ...types.url_scanner import scan_create_params, scan_screenshot_params +from ...types.url_scanner.scan_get_response import ScanGetResponse +from ...types.url_scanner.scan_har_response import ScanHarResponse +from ...types.url_scanner.scan_create_response import ScanCreateResponse __all__ = ["Scans", "AsyncScans"] diff --git a/src/cloudflare/resources/url_scanner/url_scanner.py b/src/cloudflare/resources/url_scanner/url_scanner.py index 6cd65d6c039..60dc34588e5 100644 --- a/src/cloudflare/resources/url_scanner/url_scanner.py +++ b/src/cloudflare/resources/url_scanner/url_scanner.py @@ -32,7 +32,8 @@ from ..._base_client import ( make_request_options, ) -from ...types.url_scanner import URLScannerScanResponse, url_scanner_scan_params +from ...types.url_scanner import url_scanner_scan_params +from ...types.url_scanner.url_scanner_scan_response import URLScannerScanResponse __all__ = ["URLScanner", "AsyncURLScanner"] diff --git a/src/cloudflare/resources/user/audit_logs.py b/src/cloudflare/resources/user/audit_logs.py index b05f7a40fda..f6c414adf55 100644 --- a/src/cloudflare/resources/user/audit_logs.py +++ b/src/cloudflare/resources/user/audit_logs.py @@ -24,7 +24,7 @@ AsyncPaginator, make_request_options, ) -from ...types.shared import AuditLog +from ...types.shared.audit_log import AuditLog __all__ = ["AuditLogs", "AsyncAuditLogs"] diff --git a/src/cloudflare/resources/user/billing/history.py b/src/cloudflare/resources/user/billing/history.py index 9a5556c08ed..d207535c725 100644 --- a/src/cloudflare/resources/user/billing/history.py +++ b/src/cloudflare/resources/user/billing/history.py @@ -23,7 +23,8 @@ AsyncPaginator, make_request_options, ) -from ....types.user.billing import BillingHistory, history_list_params +from ....types.user.billing import history_list_params +from ....types.user.billing.billing_history import BillingHistory __all__ = ["History", "AsyncHistory"] diff --git a/src/cloudflare/resources/user/billing/profile.py b/src/cloudflare/resources/user/billing/profile.py index 4f3928b4d55..c1b4bc78a77 100644 --- a/src/cloudflare/resources/user/billing/profile.py +++ b/src/cloudflare/resources/user/billing/profile.py @@ -19,7 +19,7 @@ from ...._base_client import ( make_request_options, ) -from ....types.user.billing import ProfileGetResponse +from ....types.user.billing.profile_get_response import ProfileGetResponse __all__ = ["Profile", "AsyncProfile"] diff --git a/src/cloudflare/resources/user/invites.py b/src/cloudflare/resources/user/invites.py index 7d752e44c38..a37a37aca00 100644 --- a/src/cloudflare/resources/user/invites.py +++ b/src/cloudflare/resources/user/invites.py @@ -22,11 +22,14 @@ ) from ..._wrappers import ResultWrapper from ...pagination import SyncSinglePage, AsyncSinglePage -from ...types.user import Invite, InviteGetResponse, InviteEditResponse, invite_edit_params +from ...types.user import invite_edit_params from ..._base_client import ( AsyncPaginator, make_request_options, ) +from ...types.user.invite import Invite +from ...types.user.invite_get_response import InviteGetResponse +from ...types.user.invite_edit_response import InviteEditResponse __all__ = ["Invites", "AsyncInvites"] diff --git a/src/cloudflare/resources/user/organizations.py b/src/cloudflare/resources/user/organizations.py index 02cbbc4904f..9db1cf722d1 100644 --- a/src/cloudflare/resources/user/organizations.py +++ b/src/cloudflare/resources/user/organizations.py @@ -22,17 +22,14 @@ ) from ..._wrappers import ResultWrapper from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from ...types.user import ( - Organization, - OrganizationGetResponse, - OrganizationDeleteResponse, - organization_list_params, - organization_delete_params, -) +from ...types.user import organization_list_params, organization_delete_params from ..._base_client import ( AsyncPaginator, make_request_options, ) +from ...types.user.organization import Organization +from ...types.user.organization_get_response import OrganizationGetResponse +from ...types.user.organization_delete_response import OrganizationDeleteResponse __all__ = ["Organizations", "AsyncOrganizations"] diff --git a/src/cloudflare/resources/user/subscriptions.py b/src/cloudflare/resources/user/subscriptions.py index d851a067221..91ae1d9d4ef 100644 --- a/src/cloudflare/resources/user/subscriptions.py +++ b/src/cloudflare/resources/user/subscriptions.py @@ -22,13 +22,6 @@ ) from ..._wrappers import ResultWrapper from ...types.user import ( - RatePlanParam, - SubscriptionZoneParam, - SubscriptionGetResponse, - SubscriptionEditResponse, - SubscriptionComponentParam, - SubscriptionDeleteResponse, - SubscriptionUpdateResponse, subscription_edit_params, subscription_delete_params, subscription_update_params, @@ -36,6 +29,13 @@ from ..._base_client import ( make_request_options, ) +from ...types.user.rate_plan_param import RatePlanParam +from ...types.user.subscription_zone_param import SubscriptionZoneParam +from ...types.user.subscription_get_response import SubscriptionGetResponse +from ...types.user.subscription_edit_response import SubscriptionEditResponse +from ...types.user.subscription_component_param import SubscriptionComponentParam +from ...types.user.subscription_delete_response import SubscriptionDeleteResponse +from ...types.user.subscription_update_response import SubscriptionUpdateResponse __all__ = ["Subscriptions", "AsyncSubscriptions"] diff --git a/src/cloudflare/resources/user/tokens/tokens.py b/src/cloudflare/resources/user/tokens/tokens.py index dc654938e26..bd2cf1093f5 100644 --- a/src/cloudflare/resources/user/tokens/tokens.py +++ b/src/cloudflare/resources/user/tokens/tokens.py @@ -31,18 +31,7 @@ ) from ...._wrappers import ResultWrapper from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from ....types.user import ( - PolicyParam, - TokenGetResponse, - TokenCreateResponse, - TokenDeleteResponse, - TokenUpdateResponse, - TokenVerifyResponse, - token_list_params, - token_create_params, - token_delete_params, - token_update_params, -) +from ....types.user import token_list_params, token_create_params, token_delete_params, token_update_params from ...._base_client import ( AsyncPaginator, make_request_options, @@ -55,6 +44,12 @@ PermissionGroupsWithStreamingResponse, AsyncPermissionGroupsWithStreamingResponse, ) +from ....types.user.policy_param import PolicyParam +from ....types.user.token_get_response import TokenGetResponse +from ....types.user.token_create_response import TokenCreateResponse +from ....types.user.token_delete_response import TokenDeleteResponse +from ....types.user.token_update_response import TokenUpdateResponse +from ....types.user.token_verify_response import TokenVerifyResponse __all__ = ["Tokens", "AsyncTokens"] diff --git a/src/cloudflare/resources/user/tokens/value.py b/src/cloudflare/resources/user/tokens/value.py index aefbc2ea930..1a35ddc543e 100644 --- a/src/cloudflare/resources/user/tokens/value.py +++ b/src/cloudflare/resources/user/tokens/value.py @@ -23,7 +23,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.user.tokens import Value, value_update_params +from ....types.user.tokens import value_update_params +from ....types.user.tokens.value import Value __all__ = ["ValueResource", "AsyncValueResource"] diff --git a/src/cloudflare/resources/user/user.py b/src/cloudflare/resources/user/user.py index 2e9b874336d..8e286c10da9 100644 --- a/src/cloudflare/resources/user/user.py +++ b/src/cloudflare/resources/user/user.py @@ -52,7 +52,7 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.user import UserGetResponse, UserEditResponse, user_edit_params +from ...types.user import user_edit_params from .organizations import ( Organizations, AsyncOrganizations, @@ -74,6 +74,8 @@ make_request_options, ) from .billing.billing import Billing, AsyncBilling +from ...types.user.user_get_response import UserGetResponse +from ...types.user.user_edit_response import UserEditResponse __all__ = ["User", "AsyncUser"] diff --git a/src/cloudflare/resources/vectorize/indexes.py b/src/cloudflare/resources/vectorize/indexes.py index b61fd922388..a97045f77f9 100644 --- a/src/cloudflare/resources/vectorize/indexes.py +++ b/src/cloudflare/resources/vectorize/indexes.py @@ -26,12 +26,6 @@ make_request_options, ) from ...types.vectorize import ( - IndexQuery, - CreateIndex, - IndexInsert, - IndexUpsert, - IndexDeleteResponse, - IndexDeleteVectorsByID, index_query_params, index_create_params, index_insert_params, @@ -40,6 +34,12 @@ index_get_by_ids_params, index_delete_by_ids_params, ) +from ...types.vectorize.index_query import IndexQuery +from ...types.vectorize.create_index import CreateIndex +from ...types.vectorize.index_insert import IndexInsert +from ...types.vectorize.index_upsert import IndexUpsert +from ...types.vectorize.index_delete_response import IndexDeleteResponse +from ...types.vectorize.index_delete_vectors_by_id import IndexDeleteVectorsByID __all__ = ["Indexes", "AsyncIndexes"] diff --git a/src/cloudflare/resources/waiting_rooms/events/details.py b/src/cloudflare/resources/waiting_rooms/events/details.py index b3908557987..6553dde0b72 100644 --- a/src/cloudflare/resources/waiting_rooms/events/details.py +++ b/src/cloudflare/resources/waiting_rooms/events/details.py @@ -19,7 +19,7 @@ from ...._base_client import ( make_request_options, ) -from ....types.waiting_rooms.events import DetailGetResponse +from ....types.waiting_rooms.events.detail_get_response import DetailGetResponse __all__ = ["Details", "AsyncDetails"] diff --git a/src/cloudflare/resources/waiting_rooms/events/events.py b/src/cloudflare/resources/waiting_rooms/events/events.py index 0af0933a4d7..020a6e49d0e 100644 --- a/src/cloudflare/resources/waiting_rooms/events/events.py +++ b/src/cloudflare/resources/waiting_rooms/events/events.py @@ -34,14 +34,14 @@ make_request_options, ) from ....types.waiting_rooms import ( - Event, - EventDeleteResponse, event_edit_params, event_list_params, event_create_params, event_delete_params, event_update_params, ) +from ....types.waiting_rooms.event import Event +from ....types.waiting_rooms.event_delete_response import EventDeleteResponse __all__ = ["Events", "AsyncEvents"] diff --git a/src/cloudflare/resources/waiting_rooms/page.py b/src/cloudflare/resources/waiting_rooms/page.py index e6851cec807..7acae55f4d9 100644 --- a/src/cloudflare/resources/waiting_rooms/page.py +++ b/src/cloudflare/resources/waiting_rooms/page.py @@ -23,7 +23,8 @@ from ..._base_client import ( make_request_options, ) -from ...types.waiting_rooms import PagePreviewResponse, page_preview_params +from ...types.waiting_rooms import page_preview_params +from ...types.waiting_rooms.page_preview_response import PagePreviewResponse __all__ = ["Page", "AsyncPage"] diff --git a/src/cloudflare/resources/waiting_rooms/rules.py b/src/cloudflare/resources/waiting_rooms/rules.py index d4f4cc3e920..fef072ae83d 100644 --- a/src/cloudflare/resources/waiting_rooms/rules.py +++ b/src/cloudflare/resources/waiting_rooms/rules.py @@ -26,17 +26,12 @@ AsyncPaginator, make_request_options, ) -from ...types.waiting_rooms import ( - WaitingRoomRule, - RuleEditResponse, - RuleCreateResponse, - RuleDeleteResponse, - RuleUpdateResponse, - rule_edit_params, - rule_create_params, - rule_delete_params, - rule_update_params, -) +from ...types.waiting_rooms import rule_edit_params, rule_create_params, rule_delete_params, rule_update_params +from ...types.waiting_rooms.waiting_room_rule import WaitingRoomRule +from ...types.waiting_rooms.rule_edit_response import RuleEditResponse +from ...types.waiting_rooms.rule_create_response import RuleCreateResponse +from ...types.waiting_rooms.rule_delete_response import RuleDeleteResponse +from ...types.waiting_rooms.rule_update_response import RuleUpdateResponse __all__ = ["Rules", "AsyncRules"] diff --git a/src/cloudflare/resources/waiting_rooms/settings.py b/src/cloudflare/resources/waiting_rooms/settings.py index 4a9f8b44010..720962bab8a 100644 --- a/src/cloudflare/resources/waiting_rooms/settings.py +++ b/src/cloudflare/resources/waiting_rooms/settings.py @@ -23,13 +23,10 @@ from ..._base_client import ( make_request_options, ) -from ...types.waiting_rooms import ( - SettingGetResponse, - SettingEditResponse, - SettingUpdateResponse, - setting_edit_params, - setting_update_params, -) +from ...types.waiting_rooms import setting_edit_params, setting_update_params +from ...types.waiting_rooms.setting_get_response import SettingGetResponse +from ...types.waiting_rooms.setting_edit_response import SettingEditResponse +from ...types.waiting_rooms.setting_update_response import SettingUpdateResponse __all__ = ["Settings", "AsyncSettings"] diff --git a/src/cloudflare/resources/waiting_rooms/statuses.py b/src/cloudflare/resources/waiting_rooms/statuses.py index 9a17336609f..b77fbb5ac59 100644 --- a/src/cloudflare/resources/waiting_rooms/statuses.py +++ b/src/cloudflare/resources/waiting_rooms/statuses.py @@ -19,7 +19,7 @@ from ..._base_client import ( make_request_options, ) -from ...types.waiting_rooms import StatusGetResponse +from ...types.waiting_rooms.status_get_response import StatusGetResponse __all__ = ["Statuses", "AsyncStatuses"] diff --git a/src/cloudflare/resources/waiting_rooms/waiting_rooms.py b/src/cloudflare/resources/waiting_rooms/waiting_rooms.py index 3444d5c7f4a..836e511dfa5 100644 --- a/src/cloudflare/resources/waiting_rooms/waiting_rooms.py +++ b/src/cloudflare/resources/waiting_rooms/waiting_rooms.py @@ -68,16 +68,16 @@ make_request_options, ) from ...types.waiting_rooms import ( - WaitingRoom, - AdditionalRoutesParam, - CookieAttributesParam, - WaitingRoomDeleteResponse, waiting_room_edit_params, waiting_room_list_params, waiting_room_create_params, waiting_room_delete_params, waiting_room_update_params, ) +from ...types.waiting_rooms.waiting_room import WaitingRoom +from ...types.waiting_rooms.additional_routes_param import AdditionalRoutesParam +from ...types.waiting_rooms.cookie_attributes_param import CookieAttributesParam +from ...types.waiting_rooms.waiting_room_delete_response import WaitingRoomDeleteResponse __all__ = ["WaitingRooms", "AsyncWaitingRooms"] diff --git a/src/cloudflare/resources/warp_connector.py b/src/cloudflare/resources/warp_connector.py index c5d57177152..ac797c82219 100644 --- a/src/cloudflare/resources/warp_connector.py +++ b/src/cloudflare/resources/warp_connector.py @@ -27,17 +27,17 @@ make_request_options, ) from ..types.warp_connector import ( - WARPConnectorGetResponse, - WARPConnectorEditResponse, - WARPConnectorListResponse, - WARPConnectorTokenResponse, - WARPConnectorCreateResponse, - WARPConnectorDeleteResponse, warp_connector_edit_params, warp_connector_list_params, warp_connector_create_params, warp_connector_delete_params, ) +from ..types.warp_connector.warp_connector_get_response import WARPConnectorGetResponse +from ..types.warp_connector.warp_connector_edit_response import WARPConnectorEditResponse +from ..types.warp_connector.warp_connector_list_response import WARPConnectorListResponse +from ..types.warp_connector.warp_connector_token_response import WARPConnectorTokenResponse +from ..types.warp_connector.warp_connector_create_response import WARPConnectorCreateResponse +from ..types.warp_connector.warp_connector_delete_response import WARPConnectorDeleteResponse __all__ = ["WARPConnector", "AsyncWARPConnector"] diff --git a/src/cloudflare/resources/web3/hostnames/hostnames.py b/src/cloudflare/resources/web3/hostnames/hostnames.py index 0d8235c38d9..bf43d02a2be 100644 --- a/src/cloudflare/resources/web3/hostnames/hostnames.py +++ b/src/cloudflare/resources/web3/hostnames/hostnames.py @@ -22,13 +22,7 @@ ) from ...._wrappers import ResultWrapper from ....pagination import SyncSinglePage, AsyncSinglePage -from ....types.web3 import ( - Hostname, - HostnameDeleteResponse, - hostname_edit_params, - hostname_create_params, - hostname_delete_params, -) +from ....types.web3 import hostname_edit_params, hostname_create_params, hostname_delete_params from ...._base_client import ( AsyncPaginator, make_request_options, @@ -41,6 +35,8 @@ IPFSUniversalPathsWithStreamingResponse, AsyncIPFSUniversalPathsWithStreamingResponse, ) +from ....types.web3.hostname import Hostname +from ....types.web3.hostname_delete_response import HostnameDeleteResponse from .ipfs_universal_paths.ipfs_universal_paths import IPFSUniversalPaths, AsyncIPFSUniversalPaths __all__ = ["Hostnames", "AsyncHostnames"] diff --git a/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/content_lists.py b/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/content_lists.py index 0e65e3afcf2..3e93d53f434 100644 --- a/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/content_lists.py +++ b/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/content_lists.py @@ -32,7 +32,8 @@ from ......_base_client import ( make_request_options, ) -from ......types.web3.hostnames.ipfs_universal_paths import ContentList, content_list_update_params +from ......types.web3.hostnames.ipfs_universal_paths import content_list_update_params +from ......types.web3.hostnames.ipfs_universal_paths.content_list import ContentList __all__ = ["ContentLists", "AsyncContentLists"] diff --git a/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/entries.py b/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/entries.py index cabfd56c38b..72d9b730a85 100644 --- a/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/entries.py +++ b/src/cloudflare/resources/web3/hostnames/ipfs_universal_paths/content_lists/entries.py @@ -25,15 +25,15 @@ make_request_options, ) from ......types.web3.hostnames.ipfs_universal_paths.content_lists import ( - EntryGetResponse, - EntryListResponse, - EntryCreateResponse, - EntryDeleteResponse, - EntryUpdateResponse, entry_create_params, entry_delete_params, entry_update_params, ) +from ......types.web3.hostnames.ipfs_universal_paths.content_lists.entry_get_response import EntryGetResponse +from ......types.web3.hostnames.ipfs_universal_paths.content_lists.entry_list_response import EntryListResponse +from ......types.web3.hostnames.ipfs_universal_paths.content_lists.entry_create_response import EntryCreateResponse +from ......types.web3.hostnames.ipfs_universal_paths.content_lists.entry_delete_response import EntryDeleteResponse +from ......types.web3.hostnames.ipfs_universal_paths.content_lists.entry_update_response import EntryUpdateResponse __all__ = ["Entries", "AsyncEntries"] diff --git a/src/cloudflare/resources/workers/account_settings.py b/src/cloudflare/resources/workers/account_settings.py index 47e1ad4ffab..19c1c12386a 100644 --- a/src/cloudflare/resources/workers/account_settings.py +++ b/src/cloudflare/resources/workers/account_settings.py @@ -23,7 +23,9 @@ from ..._base_client import ( make_request_options, ) -from ...types.workers import AccountSettingGetResponse, AccountSettingUpdateResponse, account_setting_update_params +from ...types.workers import account_setting_update_params +from ...types.workers.account_setting_get_response import AccountSettingGetResponse +from ...types.workers.account_setting_update_response import AccountSettingUpdateResponse __all__ = ["AccountSettings", "AsyncAccountSettings"] diff --git a/src/cloudflare/resources/workers/ai.py b/src/cloudflare/resources/workers/ai.py index ecd0be332d2..5ac6419485b 100644 --- a/src/cloudflare/resources/workers/ai.py +++ b/src/cloudflare/resources/workers/ai.py @@ -24,7 +24,8 @@ from ..._base_client import ( make_request_options, ) -from ...types.workers import AIRunResponse, ai_run_params +from ...types.workers import ai_run_params +from ...types.workers.ai_run_response import AIRunResponse __all__ = ["AI", "AsyncAI"] diff --git a/src/cloudflare/resources/workers/domains.py b/src/cloudflare/resources/workers/domains.py index a37ee7f746c..74c197defbf 100644 --- a/src/cloudflare/resources/workers/domains.py +++ b/src/cloudflare/resources/workers/domains.py @@ -25,7 +25,8 @@ AsyncPaginator, make_request_options, ) -from ...types.workers import Domain, domain_list_params, domain_delete_params, domain_update_params +from ...types.workers import domain_list_params, domain_delete_params, domain_update_params +from ...types.workers.domain import Domain __all__ = ["Domains", "AsyncDomains"] diff --git a/src/cloudflare/resources/workers/scripts/content.py b/src/cloudflare/resources/workers/scripts/content.py index d983ebec53f..eb34c645769 100644 --- a/src/cloudflare/resources/workers/scripts/content.py +++ b/src/cloudflare/resources/workers/scripts/content.py @@ -33,8 +33,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.workers import Script, WorkerMetadataParam +from ....types.workers.script import Script from ....types.workers.scripts import content_update_params +from ....types.workers.worker_metadata_param import WorkerMetadataParam __all__ = ["Content", "AsyncContent"] diff --git a/src/cloudflare/resources/workers/scripts/deployments.py b/src/cloudflare/resources/workers/scripts/deployments.py index 7ba21ffe58a..4868ee27f92 100644 --- a/src/cloudflare/resources/workers/scripts/deployments.py +++ b/src/cloudflare/resources/workers/scripts/deployments.py @@ -23,12 +23,10 @@ from ...._base_client import ( make_request_options, ) -from ....types.workers.scripts import ( - DeploymentParam, - DeploymentGetResponse, - DeploymentCreateResponse, - deployment_create_params, -) +from ....types.workers.scripts import deployment_create_params +from ....types.workers.scripts.deployment_param import DeploymentParam +from ....types.workers.scripts.deployment_get_response import DeploymentGetResponse +from ....types.workers.scripts.deployment_create_response import DeploymentCreateResponse __all__ = ["Deployments", "AsyncDeployments"] diff --git a/src/cloudflare/resources/workers/scripts/schedules.py b/src/cloudflare/resources/workers/scripts/schedules.py index 94f77e5078c..d9a67138b52 100644 --- a/src/cloudflare/resources/workers/scripts/schedules.py +++ b/src/cloudflare/resources/workers/scripts/schedules.py @@ -23,7 +23,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.workers.scripts import ScheduleGetResponse, ScheduleUpdateResponse, schedule_update_params +from ....types.workers.scripts import schedule_update_params +from ....types.workers.scripts.schedule_get_response import ScheduleGetResponse +from ....types.workers.scripts.schedule_update_response import ScheduleUpdateResponse __all__ = ["Schedules", "AsyncSchedules"] diff --git a/src/cloudflare/resources/workers/scripts/scripts.py b/src/cloudflare/resources/workers/scripts/scripts.py index 16572cdbd42..41e87111417 100644 --- a/src/cloudflare/resources/workers/scripts/scripts.py +++ b/src/cloudflare/resources/workers/scripts/scripts.py @@ -82,7 +82,8 @@ AsyncPaginator, make_request_options, ) -from ....types.workers import Script, script_delete_params, script_update_params +from ....types.workers import script_delete_params, script_update_params +from ....types.workers.script import Script __all__ = ["Scripts", "AsyncScripts"] diff --git a/src/cloudflare/resources/workers/scripts/settings.py b/src/cloudflare/resources/workers/scripts/settings.py index 7024efda74e..b86f77ce2d3 100644 --- a/src/cloudflare/resources/workers/scripts/settings.py +++ b/src/cloudflare/resources/workers/scripts/settings.py @@ -23,8 +23,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.workers import ScriptSetting -from ....types.workers.scripts import ConsumerScriptParam, setting_edit_params +from ....types.workers.scripts import setting_edit_params +from ....types.workers.script_setting import ScriptSetting +from ....types.workers.scripts.consumer_script_param import ConsumerScriptParam __all__ = ["Settings", "AsyncSettings"] diff --git a/src/cloudflare/resources/workers/scripts/tail.py b/src/cloudflare/resources/workers/scripts/tail.py index 8837dd51032..1a066d9db0a 100644 --- a/src/cloudflare/resources/workers/scripts/tail.py +++ b/src/cloudflare/resources/workers/scripts/tail.py @@ -23,13 +23,10 @@ from ...._base_client import ( make_request_options, ) -from ....types.workers.scripts import ( - TailGetResponse, - TailCreateResponse, - TailDeleteResponse, - tail_create_params, - tail_delete_params, -) +from ....types.workers.scripts import tail_create_params, tail_delete_params +from ....types.workers.scripts.tail_get_response import TailGetResponse +from ....types.workers.scripts.tail_create_response import TailCreateResponse +from ....types.workers.scripts.tail_delete_response import TailDeleteResponse __all__ = ["Tail", "AsyncTail"] diff --git a/src/cloudflare/resources/workers/scripts/versions.py b/src/cloudflare/resources/workers/scripts/versions.py index 3ff9a2d3b14..19f739b6c02 100644 --- a/src/cloudflare/resources/workers/scripts/versions.py +++ b/src/cloudflare/resources/workers/scripts/versions.py @@ -25,12 +25,10 @@ from ...._base_client import ( make_request_options, ) -from ....types.workers.scripts import ( - VersionGetResponse, - VersionListResponse, - VersionCreateResponse, - version_create_params, -) +from ....types.workers.scripts import version_create_params +from ....types.workers.scripts.version_get_response import VersionGetResponse +from ....types.workers.scripts.version_list_response import VersionListResponse +from ....types.workers.scripts.version_create_response import VersionCreateResponse __all__ = ["Versions", "AsyncVersions"] diff --git a/src/cloudflare/resources/workers/subdomains.py b/src/cloudflare/resources/workers/subdomains.py index 63cd1e653ca..7f495bc060c 100644 --- a/src/cloudflare/resources/workers/subdomains.py +++ b/src/cloudflare/resources/workers/subdomains.py @@ -23,7 +23,9 @@ from ..._base_client import ( make_request_options, ) -from ...types.workers import SubdomainGetResponse, SubdomainUpdateResponse, subdomain_update_params +from ...types.workers import subdomain_update_params +from ...types.workers.subdomain_get_response import SubdomainGetResponse +from ...types.workers.subdomain_update_response import SubdomainUpdateResponse __all__ = ["Subdomains", "AsyncSubdomains"] diff --git a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/namespaces.py b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/namespaces.py index 676be32d2d4..c9f41477f4a 100644 --- a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/namespaces.py +++ b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/namespaces.py @@ -34,12 +34,10 @@ AsyncPaginator, make_request_options, ) -from .....types.workers_for_platforms.dispatch import ( - NamespaceGetResponse, - NamespaceListResponse, - NamespaceCreateResponse, - namespace_create_params, -) +from .....types.workers_for_platforms.dispatch import namespace_create_params +from .....types.workers_for_platforms.dispatch.namespace_get_response import NamespaceGetResponse +from .....types.workers_for_platforms.dispatch.namespace_list_response import NamespaceListResponse +from .....types.workers_for_platforms.dispatch.namespace_create_response import NamespaceCreateResponse __all__ = ["Namespaces", "AsyncNamespaces"] diff --git a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/bindings.py b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/bindings.py index 7e10862a79b..4290c324d98 100644 --- a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/bindings.py +++ b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/bindings.py @@ -19,7 +19,7 @@ from ......_base_client import ( make_request_options, ) -from ......types.workers_for_platforms.dispatch.namespaces.scripts import BindingGetResponse +from ......types.workers_for_platforms.dispatch.namespaces.scripts.binding_get_response import BindingGetResponse __all__ = ["Bindings", "AsyncBindings"] diff --git a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/content.py b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/content.py index 75064649757..912a6ceadaf 100644 --- a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/content.py +++ b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/content.py @@ -33,7 +33,8 @@ from ......_base_client import ( make_request_options, ) -from ......types.workers import Script, WorkerMetadataParam +from ......types.workers.script import Script +from ......types.workers.worker_metadata_param import WorkerMetadataParam from ......types.workers_for_platforms.dispatch.namespaces.scripts import content_update_params __all__ = ["Content", "AsyncContent"] diff --git a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/scripts.py b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/scripts.py index da2a4c4a244..27a3e24dde8 100644 --- a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/scripts.py +++ b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/scripts.py @@ -64,8 +64,9 @@ from ......_base_client import ( make_request_options, ) -from ......types.workers import Script -from ......types.workers_for_platforms.dispatch.namespaces import Script, script_delete_params, script_update_params +from ......types.workers.script import Script as WorkersScript +from ......types.workers_for_platforms.dispatch.namespaces import script_delete_params, script_update_params +from ......types.workers_for_platforms.dispatch.namespaces.script import Script as NamespacesScript __all__ = ["Scripts", "AsyncScripts"] @@ -114,7 +115,7 @@ def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[Script]: + ) -> Optional[WorkersScript]: """Upload a worker module to a Workers for Platforms namespace. You can find an @@ -160,7 +161,7 @@ def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[Script]: + ) -> Optional[WorkersScript]: """Upload a worker module to a Workers for Platforms namespace. You can find an @@ -203,7 +204,7 @@ def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[Script]: + ) -> Optional[WorkersScript]: if not account_id: raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}") if not dispatch_namespace: @@ -225,9 +226,9 @@ def update( extra_query=extra_query, extra_body=extra_body, timeout=timeout, - post_parser=ResultWrapper[Optional[Script]]._unwrapper, + post_parser=ResultWrapper[Optional[WorkersScript]]._unwrapper, ), - cast_to=cast(Type[Optional[Script]], ResultWrapper[Script]), + cast_to=cast(Type[Optional[WorkersScript]], ResultWrapper[WorkersScript]), ) def delete( @@ -301,7 +302,7 @@ def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[Script]: + ) -> Optional[NamespacesScript]: """ Fetch information about a script uploaded to a Workers for Platforms namespace. @@ -333,9 +334,9 @@ def get( extra_query=extra_query, extra_body=extra_body, timeout=timeout, - post_parser=ResultWrapper[Optional[Script]]._unwrapper, + post_parser=ResultWrapper[Optional[NamespacesScript]]._unwrapper, ), - cast_to=cast(Type[Optional[Script]], ResultWrapper[Script]), + cast_to=cast(Type[Optional[NamespacesScript]], ResultWrapper[NamespacesScript]), ) @@ -383,7 +384,7 @@ async def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[Script]: + ) -> Optional[WorkersScript]: """Upload a worker module to a Workers for Platforms namespace. You can find an @@ -429,7 +430,7 @@ async def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[Script]: + ) -> Optional[WorkersScript]: """Upload a worker module to a Workers for Platforms namespace. You can find an @@ -472,7 +473,7 @@ async def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[Script]: + ) -> Optional[WorkersScript]: if not account_id: raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}") if not dispatch_namespace: @@ -494,9 +495,9 @@ async def update( extra_query=extra_query, extra_body=extra_body, timeout=timeout, - post_parser=ResultWrapper[Optional[Script]]._unwrapper, + post_parser=ResultWrapper[Optional[WorkersScript]]._unwrapper, ), - cast_to=cast(Type[Optional[Script]], ResultWrapper[Script]), + cast_to=cast(Type[Optional[WorkersScript]], ResultWrapper[WorkersScript]), ) async def delete( @@ -570,7 +571,7 @@ async def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[Script]: + ) -> Optional[NamespacesScript]: """ Fetch information about a script uploaded to a Workers for Platforms namespace. @@ -602,9 +603,9 @@ async def get( extra_query=extra_query, extra_body=extra_body, timeout=timeout, - post_parser=ResultWrapper[Optional[Script]]._unwrapper, + post_parser=ResultWrapper[Optional[NamespacesScript]]._unwrapper, ), - cast_to=cast(Type[Optional[Script]], ResultWrapper[Script]), + cast_to=cast(Type[Optional[NamespacesScript]], ResultWrapper[NamespacesScript]), ) diff --git a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/secrets.py b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/secrets.py index 6e08fc93838..59070a205e3 100644 --- a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/secrets.py +++ b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/secrets.py @@ -26,11 +26,9 @@ AsyncPaginator, make_request_options, ) -from ......types.workers_for_platforms.dispatch.namespaces.scripts import ( - SecretListResponse, - SecretUpdateResponse, - secret_update_params, -) +from ......types.workers_for_platforms.dispatch.namespaces.scripts import secret_update_params +from ......types.workers_for_platforms.dispatch.namespaces.scripts.secret_list_response import SecretListResponse +from ......types.workers_for_platforms.dispatch.namespaces.scripts.secret_update_response import SecretUpdateResponse __all__ = ["Secrets", "AsyncSecrets"] diff --git a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/settings.py b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/settings.py index a25e4df5d7d..91df7dc15d8 100644 --- a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/settings.py +++ b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/settings.py @@ -23,11 +23,9 @@ from ......_base_client import ( make_request_options, ) -from ......types.workers_for_platforms.dispatch.namespaces.scripts import ( - SettingGetResponse, - SettingEditResponse, - setting_edit_params, -) +from ......types.workers_for_platforms.dispatch.namespaces.scripts import setting_edit_params +from ......types.workers_for_platforms.dispatch.namespaces.scripts.setting_get_response import SettingGetResponse +from ......types.workers_for_platforms.dispatch.namespaces.scripts.setting_edit_response import SettingEditResponse __all__ = ["Settings", "AsyncSettings"] diff --git a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/tags.py b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/tags.py index 99007091601..52fb8f6123d 100644 --- a/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/tags.py +++ b/src/cloudflare/resources/workers_for_platforms/dispatch/namespaces/scripts/tags.py @@ -25,11 +25,9 @@ AsyncPaginator, make_request_options, ) -from ......types.workers_for_platforms.dispatch.namespaces.scripts import ( - TagListResponse, - TagUpdateResponse, - tag_update_params, -) +from ......types.workers_for_platforms.dispatch.namespaces.scripts import tag_update_params +from ......types.workers_for_platforms.dispatch.namespaces.scripts.tag_list_response import TagListResponse +from ......types.workers_for_platforms.dispatch.namespaces.scripts.tag_update_response import TagUpdateResponse __all__ = ["Tags", "AsyncTags"] diff --git a/src/cloudflare/resources/zero_trust/access/applications/applications.py b/src/cloudflare/resources/zero_trust/access/applications/applications.py index e77e5ca2551..6f680f5746f 100644 --- a/src/cloudflare/resources/zero_trust/access/applications/applications.py +++ b/src/cloudflare/resources/zero_trust/access/applications/applications.py @@ -50,17 +50,14 @@ UserPolicyChecksWithStreamingResponse, AsyncUserPolicyChecksWithStreamingResponse, ) -from .....types.zero_trust.access import ( - AppIDParam, - Application, - AllowedIdpsh, - CustomPagesh, - CORSHeadersParam, - SelfHostedDomainsh, - ApplicationDeleteResponse, - application_create_params, - application_update_params, -) +from .....types.zero_trust.access import application_create_params, application_update_params +from .....types.zero_trust.access.application import Application +from .....types.zero_trust.access.app_id_param import AppIDParam +from .....types.zero_trust.access.allowed_idpsh import AllowedIdpsh +from .....types.zero_trust.access.custom_pagesh import CustomPagesh +from .....types.zero_trust.access.cors_headers_param import CORSHeadersParam +from .....types.zero_trust.access.self_hosted_domainsh import SelfHostedDomainsh +from .....types.zero_trust.access.application_delete_response import ApplicationDeleteResponse __all__ = ["Applications", "AsyncApplications"] diff --git a/src/cloudflare/resources/zero_trust/access/applications/cas.py b/src/cloudflare/resources/zero_trust/access/applications/cas.py index 46a05bb216e..4a94f1f8803 100644 --- a/src/cloudflare/resources/zero_trust/access/applications/cas.py +++ b/src/cloudflare/resources/zero_trust/access/applications/cas.py @@ -21,7 +21,10 @@ AsyncPaginator, make_request_options, ) -from .....types.zero_trust.access.applications import CA, CAGetResponse, CACreateResponse, CADeleteResponse +from .....types.zero_trust.access.applications.ca import CA +from .....types.zero_trust.access.applications.ca_get_response import CAGetResponse +from .....types.zero_trust.access.applications.ca_create_response import CACreateResponse +from .....types.zero_trust.access.applications.ca_delete_response import CADeleteResponse __all__ = ["CAs", "AsyncCAs"] diff --git a/src/cloudflare/resources/zero_trust/access/applications/policies.py b/src/cloudflare/resources/zero_trust/access/applications/policies.py index 4ee51598e06..7c1375526a5 100644 --- a/src/cloudflare/resources/zero_trust/access/applications/policies.py +++ b/src/cloudflare/resources/zero_trust/access/applications/policies.py @@ -26,14 +26,11 @@ AsyncPaginator, make_request_options, ) -from .....types.zero_trust import AccessRuleParam -from .....types.zero_trust.access.applications import ( - Policy, - ApprovalGroupParam, - PolicyDeleteResponse, - policy_create_params, - policy_update_params, -) +from .....types.zero_trust.access_rule_param import AccessRuleParam +from .....types.zero_trust.access.applications import policy_create_params, policy_update_params +from .....types.zero_trust.access.applications.policy import Policy +from .....types.zero_trust.access.applications.approval_group_param import ApprovalGroupParam +from .....types.zero_trust.access.applications.policy_delete_response import PolicyDeleteResponse __all__ = ["Policies", "AsyncPolicies"] diff --git a/src/cloudflare/resources/zero_trust/access/applications/user_policy_checks.py b/src/cloudflare/resources/zero_trust/access/applications/user_policy_checks.py index b68be071fbe..81a5cd0cc11 100644 --- a/src/cloudflare/resources/zero_trust/access/applications/user_policy_checks.py +++ b/src/cloudflare/resources/zero_trust/access/applications/user_policy_checks.py @@ -19,8 +19,8 @@ from ....._base_client import ( make_request_options, ) -from .....types.zero_trust.access import AppIDParam -from .....types.zero_trust.access.applications import UserPolicyCheckListResponse +from .....types.zero_trust.access.app_id_param import AppIDParam +from .....types.zero_trust.access.applications.user_policy_check_list_response import UserPolicyCheckListResponse __all__ = ["UserPolicyChecks", "AsyncUserPolicyChecks"] diff --git a/src/cloudflare/resources/zero_trust/access/bookmarks.py b/src/cloudflare/resources/zero_trust/access/bookmarks.py index 0b0e27aba3b..69a89ac111d 100644 --- a/src/cloudflare/resources/zero_trust/access/bookmarks.py +++ b/src/cloudflare/resources/zero_trust/access/bookmarks.py @@ -25,13 +25,9 @@ AsyncPaginator, make_request_options, ) -from ....types.zero_trust.access import ( - Bookmark, - BookmarkDeleteResponse, - bookmark_create_params, - bookmark_delete_params, - bookmark_update_params, -) +from ....types.zero_trust.access import bookmark_create_params, bookmark_delete_params, bookmark_update_params +from ....types.zero_trust.access.bookmark import Bookmark +from ....types.zero_trust.access.bookmark_delete_response import BookmarkDeleteResponse __all__ = ["Bookmarks", "AsyncBookmarks"] diff --git a/src/cloudflare/resources/zero_trust/access/certificates/certificates.py b/src/cloudflare/resources/zero_trust/access/certificates/certificates.py index 34a0cb26b2e..6adc91144f8 100644 --- a/src/cloudflare/resources/zero_trust/access/certificates/certificates.py +++ b/src/cloudflare/resources/zero_trust/access/certificates/certificates.py @@ -33,13 +33,10 @@ AsyncPaginator, make_request_options, ) -from .....types.zero_trust.access import ( - Certificate, - AssociatedHostnames, - CertificateDeleteResponse, - certificate_create_params, - certificate_update_params, -) +from .....types.zero_trust.access import certificate_create_params, certificate_update_params +from .....types.zero_trust.access.certificate import Certificate +from .....types.zero_trust.access.associated_hostnames import AssociatedHostnames +from .....types.zero_trust.access.certificate_delete_response import CertificateDeleteResponse __all__ = ["Certificates", "AsyncCertificates"] diff --git a/src/cloudflare/resources/zero_trust/access/certificates/settings.py b/src/cloudflare/resources/zero_trust/access/certificates/settings.py index 3b3b56194f8..fe7b24f19a3 100644 --- a/src/cloudflare/resources/zero_trust/access/certificates/settings.py +++ b/src/cloudflare/resources/zero_trust/access/certificates/settings.py @@ -23,12 +23,10 @@ from ....._base_client import ( make_request_options, ) -from .....types.zero_trust.access.certificates import ( - SettingGetResponse, - SettingUpdateResponse, - CertificateSettingsParam, - setting_update_params, -) +from .....types.zero_trust.access.certificates import setting_update_params +from .....types.zero_trust.access.certificates.setting_get_response import SettingGetResponse +from .....types.zero_trust.access.certificates.setting_update_response import SettingUpdateResponse +from .....types.zero_trust.access.certificates.certificate_settings_param import CertificateSettingsParam __all__ = ["Settings", "AsyncSettings"] diff --git a/src/cloudflare/resources/zero_trust/access/custom_pages.py b/src/cloudflare/resources/zero_trust/access/custom_pages.py index 4bfcd5432ef..0e0cec95dcc 100644 --- a/src/cloudflare/resources/zero_trust/access/custom_pages.py +++ b/src/cloudflare/resources/zero_trust/access/custom_pages.py @@ -26,13 +26,10 @@ AsyncPaginator, make_request_options, ) -from ....types.zero_trust.access import ( - CustomPage, - CustomPageWithoutHTML, - CustomPageDeleteResponse, - custom_page_create_params, - custom_page_update_params, -) +from ....types.zero_trust.access import custom_page_create_params, custom_page_update_params +from ....types.zero_trust.access.custom_page import CustomPage +from ....types.zero_trust.access.custom_page_without_html import CustomPageWithoutHTML +from ....types.zero_trust.access.custom_page_delete_response import CustomPageDeleteResponse __all__ = ["CustomPages", "AsyncCustomPages"] diff --git a/src/cloudflare/resources/zero_trust/access/groups.py b/src/cloudflare/resources/zero_trust/access/groups.py index d03d76ff2aa..7afb7c2eafa 100644 --- a/src/cloudflare/resources/zero_trust/access/groups.py +++ b/src/cloudflare/resources/zero_trust/access/groups.py @@ -25,8 +25,10 @@ AsyncPaginator, make_request_options, ) -from ....types.zero_trust import AccessRuleParam -from ....types.zero_trust.access import ZeroTrustGroup, GroupDeleteResponse, group_create_params, group_update_params +from ....types.zero_trust.access import group_create_params, group_update_params +from ....types.zero_trust.access_rule_param import AccessRuleParam +from ....types.zero_trust.access.zero_trust_group import ZeroTrustGroup +from ....types.zero_trust.access.group_delete_response import GroupDeleteResponse __all__ = ["Groups", "AsyncGroups"] diff --git a/src/cloudflare/resources/zero_trust/access/keys.py b/src/cloudflare/resources/zero_trust/access/keys.py index 558ed003550..b7021a5447f 100644 --- a/src/cloudflare/resources/zero_trust/access/keys.py +++ b/src/cloudflare/resources/zero_trust/access/keys.py @@ -23,7 +23,10 @@ from ...._base_client import ( make_request_options, ) -from ....types.zero_trust.access import KeyGetResponse, KeyRotateResponse, KeyUpdateResponse, key_update_params +from ....types.zero_trust.access import key_update_params +from ....types.zero_trust.access.key_get_response import KeyGetResponse +from ....types.zero_trust.access.key_rotate_response import KeyRotateResponse +from ....types.zero_trust.access.key_update_response import KeyUpdateResponse __all__ = ["Keys", "AsyncKeys"] diff --git a/src/cloudflare/resources/zero_trust/access/logs/access_requests.py b/src/cloudflare/resources/zero_trust/access/logs/access_requests.py index 3317b9b9aad..9acf391b4c4 100644 --- a/src/cloudflare/resources/zero_trust/access/logs/access_requests.py +++ b/src/cloudflare/resources/zero_trust/access/logs/access_requests.py @@ -19,7 +19,7 @@ from ....._base_client import ( make_request_options, ) -from .....types.zero_trust.access.logs import AccessRequestListResponse +from .....types.zero_trust.access.logs.access_request_list_response import AccessRequestListResponse __all__ = ["AccessRequests", "AsyncAccessRequests"] diff --git a/src/cloudflare/resources/zero_trust/access/service_tokens.py b/src/cloudflare/resources/zero_trust/access/service_tokens.py index fa4b6751ab9..ce562d6ca2a 100644 --- a/src/cloudflare/resources/zero_trust/access/service_tokens.py +++ b/src/cloudflare/resources/zero_trust/access/service_tokens.py @@ -25,13 +25,10 @@ AsyncPaginator, make_request_options, ) -from ....types.zero_trust.access import ( - ServiceToken, - ServiceTokenCreateResponse, - ServiceTokenRotateResponse, - service_token_create_params, - service_token_update_params, -) +from ....types.zero_trust.access import service_token_create_params, service_token_update_params +from ....types.zero_trust.access.service_token import ServiceToken +from ....types.zero_trust.access.service_token_create_response import ServiceTokenCreateResponse +from ....types.zero_trust.access.service_token_rotate_response import ServiceTokenRotateResponse __all__ = ["ServiceTokens", "AsyncServiceTokens"] diff --git a/src/cloudflare/resources/zero_trust/access/tags.py b/src/cloudflare/resources/zero_trust/access/tags.py index f75ec2c339c..73fa8dd1036 100644 --- a/src/cloudflare/resources/zero_trust/access/tags.py +++ b/src/cloudflare/resources/zero_trust/access/tags.py @@ -25,7 +25,9 @@ AsyncPaginator, make_request_options, ) -from ....types.zero_trust.access import Tag, TagDeleteResponse, tag_create_params, tag_update_params +from ....types.zero_trust.access import tag_create_params, tag_update_params +from ....types.zero_trust.access.tag import Tag +from ....types.zero_trust.access.tag_delete_response import TagDeleteResponse __all__ = ["Tags", "AsyncTags"] diff --git a/src/cloudflare/resources/zero_trust/access/users/active_sessions.py b/src/cloudflare/resources/zero_trust/access/users/active_sessions.py index 55196246f04..e6a6100c8df 100644 --- a/src/cloudflare/resources/zero_trust/access/users/active_sessions.py +++ b/src/cloudflare/resources/zero_trust/access/users/active_sessions.py @@ -21,7 +21,8 @@ AsyncPaginator, make_request_options, ) -from .....types.zero_trust.access.users import ActiveSessionGetResponse, ActiveSessionListResponse +from .....types.zero_trust.access.users.active_session_get_response import ActiveSessionGetResponse +from .....types.zero_trust.access.users.active_session_list_response import ActiveSessionListResponse __all__ = ["ActiveSessions", "AsyncActiveSessions"] diff --git a/src/cloudflare/resources/zero_trust/access/users/failed_logins.py b/src/cloudflare/resources/zero_trust/access/users/failed_logins.py index 7f37f31f146..88d5ad5f29c 100644 --- a/src/cloudflare/resources/zero_trust/access/users/failed_logins.py +++ b/src/cloudflare/resources/zero_trust/access/users/failed_logins.py @@ -18,7 +18,7 @@ AsyncPaginator, make_request_options, ) -from .....types.zero_trust.access.users import FailedLoginListResponse +from .....types.zero_trust.access.users.failed_login_list_response import FailedLoginListResponse __all__ = ["FailedLogins", "AsyncFailedLogins"] diff --git a/src/cloudflare/resources/zero_trust/access/users/last_seen_identity.py b/src/cloudflare/resources/zero_trust/access/users/last_seen_identity.py index c866277bac8..ca3f22a1623 100644 --- a/src/cloudflare/resources/zero_trust/access/users/last_seen_identity.py +++ b/src/cloudflare/resources/zero_trust/access/users/last_seen_identity.py @@ -19,7 +19,7 @@ from ....._base_client import ( make_request_options, ) -from .....types.zero_trust.access.users import Identity +from .....types.zero_trust.access.users.identity import Identity __all__ = ["LastSeenIdentity", "AsyncLastSeenIdentity"] diff --git a/src/cloudflare/resources/zero_trust/access/users/users.py b/src/cloudflare/resources/zero_trust/access/users/users.py index 98d725628d1..7660ca5d955 100644 --- a/src/cloudflare/resources/zero_trust/access/users/users.py +++ b/src/cloudflare/resources/zero_trust/access/users/users.py @@ -42,7 +42,7 @@ LastSeenIdentityWithStreamingResponse, AsyncLastSeenIdentityWithStreamingResponse, ) -from .....types.zero_trust.access import AccessUser +from .....types.zero_trust.access.access_user import AccessUser __all__ = ["Users", "AsyncUsers"] diff --git a/src/cloudflare/resources/zero_trust/connectivity_settings.py b/src/cloudflare/resources/zero_trust/connectivity_settings.py index 169bd782178..c6ca9d42562 100644 --- a/src/cloudflare/resources/zero_trust/connectivity_settings.py +++ b/src/cloudflare/resources/zero_trust/connectivity_settings.py @@ -23,11 +23,9 @@ from ..._base_client import ( make_request_options, ) -from ...types.zero_trust import ( - ConnectivitySettingGetResponse, - ConnectivitySettingEditResponse, - connectivity_setting_edit_params, -) +from ...types.zero_trust import connectivity_setting_edit_params +from ...types.zero_trust.connectivity_setting_get_response import ConnectivitySettingGetResponse +from ...types.zero_trust.connectivity_setting_edit_response import ConnectivitySettingEditResponse __all__ = ["ConnectivitySettings", "AsyncConnectivitySettings"] diff --git a/src/cloudflare/resources/zero_trust/devices/devices.py b/src/cloudflare/resources/zero_trust/devices/devices.py index 0d09042a975..1c6e0495e64 100644 --- a/src/cloudflare/resources/zero_trust/devices/devices.py +++ b/src/cloudflare/resources/zero_trust/devices/devices.py @@ -87,7 +87,8 @@ ) from .posture.posture import Posture, AsyncPosture from .policies.policies import Policies, AsyncPolicies -from ....types.zero_trust import Device, DeviceGetResponse +from ....types.zero_trust.device import Device +from ....types.zero_trust.device_get_response import DeviceGetResponse __all__ = ["Devices", "AsyncDevices"] diff --git a/src/cloudflare/resources/zero_trust/devices/dex_tests.py b/src/cloudflare/resources/zero_trust/devices/dex_tests.py index 646993aa71a..a708d856641 100644 --- a/src/cloudflare/resources/zero_trust/devices/dex_tests.py +++ b/src/cloudflare/resources/zero_trust/devices/dex_tests.py @@ -25,13 +25,10 @@ AsyncPaginator, make_request_options, ) -from ....types.zero_trust.devices import ( - SchemaHTTP, - SchemaDataParam, - DEXTestDeleteResponse, - dex_test_create_params, - dex_test_update_params, -) +from ....types.zero_trust.devices import dex_test_create_params, dex_test_update_params +from ....types.zero_trust.devices.schema_http import SchemaHTTP +from ....types.zero_trust.devices.schema_data_param import SchemaDataParam +from ....types.zero_trust.devices.dex_test_delete_response import DEXTestDeleteResponse __all__ = ["DEXTests", "AsyncDEXTests"] diff --git a/src/cloudflare/resources/zero_trust/devices/networks.py b/src/cloudflare/resources/zero_trust/devices/networks.py index d6e68ac6b9d..eaf17853c3f 100644 --- a/src/cloudflare/resources/zero_trust/devices/networks.py +++ b/src/cloudflare/resources/zero_trust/devices/networks.py @@ -26,13 +26,9 @@ AsyncPaginator, make_request_options, ) -from ....types.zero_trust.devices import ( - DeviceNetwork, - NetworkDeleteResponse, - network_create_params, - network_delete_params, - network_update_params, -) +from ....types.zero_trust.devices import network_create_params, network_delete_params, network_update_params +from ....types.zero_trust.devices.device_network import DeviceNetwork +from ....types.zero_trust.devices.network_delete_response import NetworkDeleteResponse __all__ = ["Networks", "AsyncNetworks"] diff --git a/src/cloudflare/resources/zero_trust/devices/override_codes.py b/src/cloudflare/resources/zero_trust/devices/override_codes.py index 609ace11f08..4ff95fef905 100644 --- a/src/cloudflare/resources/zero_trust/devices/override_codes.py +++ b/src/cloudflare/resources/zero_trust/devices/override_codes.py @@ -19,7 +19,7 @@ from ...._base_client import ( make_request_options, ) -from ....types.zero_trust.devices import OverrideCodeListResponse +from ....types.zero_trust.devices.override_code_list_response import OverrideCodeListResponse __all__ = ["OverrideCodes", "AsyncOverrideCodes"] diff --git a/src/cloudflare/resources/zero_trust/devices/policies/default_policy.py b/src/cloudflare/resources/zero_trust/devices/policies/default_policy.py index c929ba53460..d90c4b3686d 100644 --- a/src/cloudflare/resources/zero_trust/devices/policies/default_policy.py +++ b/src/cloudflare/resources/zero_trust/devices/policies/default_policy.py @@ -19,7 +19,7 @@ from ....._base_client import ( make_request_options, ) -from .....types.zero_trust.devices.policies import DefaultPolicyGetResponse +from .....types.zero_trust.devices.policies.default_policy_get_response import DefaultPolicyGetResponse __all__ = ["DefaultPolicy", "AsyncDefaultPolicy"] diff --git a/src/cloudflare/resources/zero_trust/devices/policies/excludes.py b/src/cloudflare/resources/zero_trust/devices/policies/excludes.py index 2ff3b7ef408..77a8d4e0f3e 100644 --- a/src/cloudflare/resources/zero_trust/devices/policies/excludes.py +++ b/src/cloudflare/resources/zero_trust/devices/policies/excludes.py @@ -25,13 +25,11 @@ AsyncPaginator, make_request_options, ) -from .....types.zero_trust.devices.policies import ( - ExcludeGetResponse, - SplitTunnelExclude, - ExcludeUpdateResponse, - SplitTunnelExcludeParam, - exclude_update_params, -) +from .....types.zero_trust.devices.policies import exclude_update_params +from .....types.zero_trust.devices.policies.exclude_get_response import ExcludeGetResponse +from .....types.zero_trust.devices.policies.split_tunnel_exclude import SplitTunnelExclude +from .....types.zero_trust.devices.policies.exclude_update_response import ExcludeUpdateResponse +from .....types.zero_trust.devices.policies.split_tunnel_exclude_param import SplitTunnelExcludeParam __all__ = ["Excludes", "AsyncExcludes"] diff --git a/src/cloudflare/resources/zero_trust/devices/policies/fallback_domains.py b/src/cloudflare/resources/zero_trust/devices/policies/fallback_domains.py index 044acd0e019..6ba4acb2840 100644 --- a/src/cloudflare/resources/zero_trust/devices/policies/fallback_domains.py +++ b/src/cloudflare/resources/zero_trust/devices/policies/fallback_domains.py @@ -25,13 +25,11 @@ AsyncPaginator, make_request_options, ) -from .....types.zero_trust.devices.policies import ( - FallbackDomain, - FallbackDomainParam, - FallbackDomainGetResponse, - FallbackDomainUpdateResponse, - fallback_domain_update_params, -) +from .....types.zero_trust.devices.policies import fallback_domain_update_params +from .....types.zero_trust.devices.policies.fallback_domain import FallbackDomain +from .....types.zero_trust.devices.policies.fallback_domain_param import FallbackDomainParam +from .....types.zero_trust.devices.policies.fallback_domain_get_response import FallbackDomainGetResponse +from .....types.zero_trust.devices.policies.fallback_domain_update_response import FallbackDomainUpdateResponse __all__ = ["FallbackDomains", "AsyncFallbackDomains"] diff --git a/src/cloudflare/resources/zero_trust/devices/policies/includes.py b/src/cloudflare/resources/zero_trust/devices/policies/includes.py index 6bd11ecfeca..81992f2723c 100644 --- a/src/cloudflare/resources/zero_trust/devices/policies/includes.py +++ b/src/cloudflare/resources/zero_trust/devices/policies/includes.py @@ -25,13 +25,11 @@ AsyncPaginator, make_request_options, ) -from .....types.zero_trust.devices.policies import ( - IncludeGetResponse, - SplitTunnelInclude, - IncludeUpdateResponse, - SplitTunnelIncludeParam, - include_update_params, -) +from .....types.zero_trust.devices.policies import include_update_params +from .....types.zero_trust.devices.policies.include_get_response import IncludeGetResponse +from .....types.zero_trust.devices.policies.split_tunnel_include import SplitTunnelInclude +from .....types.zero_trust.devices.policies.include_update_response import IncludeUpdateResponse +from .....types.zero_trust.devices.policies.split_tunnel_include_param import SplitTunnelIncludeParam __all__ = ["Includes", "AsyncIncludes"] diff --git a/src/cloudflare/resources/zero_trust/devices/policies/policies.py b/src/cloudflare/resources/zero_trust/devices/policies/policies.py index 3268210fd59..a69d429fd9f 100644 --- a/src/cloudflare/resources/zero_trust/devices/policies/policies.py +++ b/src/cloudflare/resources/zero_trust/devices/policies/policies.py @@ -57,13 +57,9 @@ FallbackDomainsWithStreamingResponse, AsyncFallbackDomainsWithStreamingResponse, ) -from .....types.zero_trust.devices import ( - SettingsPolicy, - PolicyDeleteResponse, - policy_edit_params, - policy_create_params, - policy_delete_params, -) +from .....types.zero_trust.devices import policy_edit_params, policy_create_params, policy_delete_params +from .....types.zero_trust.devices.settings_policy import SettingsPolicy +from .....types.zero_trust.devices.policy_delete_response import PolicyDeleteResponse __all__ = ["Policies", "AsyncPolicies"] diff --git a/src/cloudflare/resources/zero_trust/devices/posture/integrations.py b/src/cloudflare/resources/zero_trust/devices/posture/integrations.py index f9811ad2c64..5054101c7c1 100644 --- a/src/cloudflare/resources/zero_trust/devices/posture/integrations.py +++ b/src/cloudflare/resources/zero_trust/devices/posture/integrations.py @@ -27,12 +27,12 @@ make_request_options, ) from .....types.zero_trust.devices.posture import ( - Integration, - IntegrationDeleteResponse, integration_edit_params, integration_create_params, integration_delete_params, ) +from .....types.zero_trust.devices.posture.integration import Integration +from .....types.zero_trust.devices.posture.integration_delete_response import IntegrationDeleteResponse __all__ = ["Integrations", "AsyncIntegrations"] diff --git a/src/cloudflare/resources/zero_trust/devices/posture/posture.py b/src/cloudflare/resources/zero_trust/devices/posture/posture.py index 0865921c57d..4cb5a8e4342 100644 --- a/src/cloudflare/resources/zero_trust/devices/posture/posture.py +++ b/src/cloudflare/resources/zero_trust/devices/posture/posture.py @@ -35,14 +35,14 @@ make_request_options, ) from .....types.zero_trust.devices import ( - DeviceInputParam, - DeviceMatchParam, - DevicePostureRule, - PostureDeleteResponse, posture_create_params, posture_delete_params, posture_update_params, ) +from .....types.zero_trust.devices.device_input_param import DeviceInputParam +from .....types.zero_trust.devices.device_match_param import DeviceMatchParam +from .....types.zero_trust.devices.device_posture_rule import DevicePostureRule +from .....types.zero_trust.devices.posture_delete_response import PostureDeleteResponse __all__ = ["Posture", "AsyncPosture"] diff --git a/src/cloudflare/resources/zero_trust/devices/revoke.py b/src/cloudflare/resources/zero_trust/devices/revoke.py index 537dbb4209d..f67ea790895 100644 --- a/src/cloudflare/resources/zero_trust/devices/revoke.py +++ b/src/cloudflare/resources/zero_trust/devices/revoke.py @@ -23,7 +23,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zero_trust.devices import RevokeCreateResponse, revoke_create_params +from ....types.zero_trust.devices import revoke_create_params +from ....types.zero_trust.devices.revoke_create_response import RevokeCreateResponse __all__ = ["Revoke", "AsyncRevoke"] diff --git a/src/cloudflare/resources/zero_trust/devices/settings.py b/src/cloudflare/resources/zero_trust/devices/settings.py index 1f103ff1962..2cda06e2b4c 100644 --- a/src/cloudflare/resources/zero_trust/devices/settings.py +++ b/src/cloudflare/resources/zero_trust/devices/settings.py @@ -23,7 +23,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zero_trust.devices import DeviceSettings, setting_update_params +from ....types.zero_trust.devices import setting_update_params +from ....types.zero_trust.devices.device_settings import DeviceSettings __all__ = ["Settings", "AsyncSettings"] diff --git a/src/cloudflare/resources/zero_trust/devices/unrevoke.py b/src/cloudflare/resources/zero_trust/devices/unrevoke.py index 773f8b298a5..fa0e45a348a 100644 --- a/src/cloudflare/resources/zero_trust/devices/unrevoke.py +++ b/src/cloudflare/resources/zero_trust/devices/unrevoke.py @@ -23,7 +23,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zero_trust.devices import UnrevokeCreateResponse, unrevoke_create_params +from ....types.zero_trust.devices import unrevoke_create_params +from ....types.zero_trust.devices.unrevoke_create_response import UnrevokeCreateResponse __all__ = ["Unrevoke", "AsyncUnrevoke"] diff --git a/src/cloudflare/resources/zero_trust/dex/fleet_status/devices.py b/src/cloudflare/resources/zero_trust/dex/fleet_status/devices.py index 92606b4f12f..3b8521a9720 100644 --- a/src/cloudflare/resources/zero_trust/dex/fleet_status/devices.py +++ b/src/cloudflare/resources/zero_trust/dex/fleet_status/devices.py @@ -21,7 +21,8 @@ AsyncPaginator, make_request_options, ) -from .....types.zero_trust.dex.fleet_status import DeviceListResponse, device_list_params +from .....types.zero_trust.dex.fleet_status import device_list_params +from .....types.zero_trust.dex.fleet_status.device_list_response import DeviceListResponse __all__ = ["Devices", "AsyncDevices"] diff --git a/src/cloudflare/resources/zero_trust/dex/fleet_status/fleet_status.py b/src/cloudflare/resources/zero_trust/dex/fleet_status/fleet_status.py index fad815ead08..4c18b0c394b 100644 --- a/src/cloudflare/resources/zero_trust/dex/fleet_status/fleet_status.py +++ b/src/cloudflare/resources/zero_trust/dex/fleet_status/fleet_status.py @@ -31,7 +31,8 @@ from ....._base_client import ( make_request_options, ) -from .....types.zero_trust.dex import FleetStatusLiveResponse, fleet_status_live_params, fleet_status_over_time_params +from .....types.zero_trust.dex import fleet_status_live_params, fleet_status_over_time_params +from .....types.zero_trust.dex.fleet_status_live_response import FleetStatusLiveResponse __all__ = ["FleetStatus", "AsyncFleetStatus"] diff --git a/src/cloudflare/resources/zero_trust/dex/http_tests/http_tests.py b/src/cloudflare/resources/zero_trust/dex/http_tests/http_tests.py index 4c3b5c47d01..6cc79e85eea 100644 --- a/src/cloudflare/resources/zero_trust/dex/http_tests/http_tests.py +++ b/src/cloudflare/resources/zero_trust/dex/http_tests/http_tests.py @@ -32,7 +32,8 @@ from ....._base_client import ( make_request_options, ) -from .....types.zero_trust.dex import HTTPDetails, http_test_get_params +from .....types.zero_trust.dex import http_test_get_params +from .....types.zero_trust.dex.http_details import HTTPDetails __all__ = ["HTTPTests", "AsyncHTTPTests"] diff --git a/src/cloudflare/resources/zero_trust/dex/http_tests/percentiles.py b/src/cloudflare/resources/zero_trust/dex/http_tests/percentiles.py index 9fa41f54cd9..483481657f0 100644 --- a/src/cloudflare/resources/zero_trust/dex/http_tests/percentiles.py +++ b/src/cloudflare/resources/zero_trust/dex/http_tests/percentiles.py @@ -23,7 +23,8 @@ from ....._base_client import ( make_request_options, ) -from .....types.zero_trust.dex.http_tests import HTTPDetailsPercentiles, percentile_get_params +from .....types.zero_trust.dex.http_tests import percentile_get_params +from .....types.zero_trust.dex.http_tests.http_details_percentiles import HTTPDetailsPercentiles __all__ = ["Percentiles", "AsyncPercentiles"] diff --git a/src/cloudflare/resources/zero_trust/dex/tests/tests.py b/src/cloudflare/resources/zero_trust/dex/tests/tests.py index 9d6a4b39bd7..6aa012ccc36 100644 --- a/src/cloudflare/resources/zero_trust/dex/tests/tests.py +++ b/src/cloudflare/resources/zero_trust/dex/tests/tests.py @@ -29,7 +29,8 @@ AsyncPaginator, make_request_options, ) -from .....types.zero_trust.dex import TestListResponse, test_list_params +from .....types.zero_trust.dex import test_list_params +from .....types.zero_trust.dex.test_list_response import TestListResponse __all__ = ["Tests", "AsyncTests"] diff --git a/src/cloudflare/resources/zero_trust/dex/traceroute_test_results/network_path.py b/src/cloudflare/resources/zero_trust/dex/traceroute_test_results/network_path.py index 7d6ca84de5e..6e06ce4e360 100644 --- a/src/cloudflare/resources/zero_trust/dex/traceroute_test_results/network_path.py +++ b/src/cloudflare/resources/zero_trust/dex/traceroute_test_results/network_path.py @@ -19,7 +19,7 @@ from ....._base_client import ( make_request_options, ) -from .....types.zero_trust.dex.traceroute_test_results import NetworkPathGetResponse +from .....types.zero_trust.dex.traceroute_test_results.network_path_get_response import NetworkPathGetResponse __all__ = ["NetworkPath", "AsyncNetworkPath"] diff --git a/src/cloudflare/resources/zero_trust/dex/traceroute_tests.py b/src/cloudflare/resources/zero_trust/dex/traceroute_tests.py index 06756b0a89a..aca1740fa5a 100644 --- a/src/cloudflare/resources/zero_trust/dex/traceroute_tests.py +++ b/src/cloudflare/resources/zero_trust/dex/traceroute_tests.py @@ -24,14 +24,14 @@ from ...._base_client import ( make_request_options, ) -from ....types.zero_trust import NetworkPathResponse from ....types.zero_trust.dex import ( - Traceroute, - TracerouteTestPercentilesResponse, traceroute_test_get_params, traceroute_test_percentiles_params, traceroute_test_network_path_params, ) +from ....types.zero_trust.dex.traceroute import Traceroute +from ....types.zero_trust.network_path_response import NetworkPathResponse +from ....types.zero_trust.dex.traceroute_test_percentiles_response import TracerouteTestPercentilesResponse __all__ = ["TracerouteTests", "AsyncTracerouteTests"] diff --git a/src/cloudflare/resources/zero_trust/dlp/datasets/datasets.py b/src/cloudflare/resources/zero_trust/dlp/datasets/datasets.py index 987188df434..3c4b3c70f02 100644 --- a/src/cloudflare/resources/zero_trust/dlp/datasets/datasets.py +++ b/src/cloudflare/resources/zero_trust/dlp/datasets/datasets.py @@ -33,7 +33,9 @@ AsyncPaginator, make_request_options, ) -from .....types.zero_trust.dlp import Dataset, DatasetCreation, dataset_create_params, dataset_update_params +from .....types.zero_trust.dlp import dataset_create_params, dataset_update_params +from .....types.zero_trust.dlp.dataset import Dataset +from .....types.zero_trust.dlp.dataset_creation import DatasetCreation __all__ = ["Datasets", "AsyncDatasets"] diff --git a/src/cloudflare/resources/zero_trust/dlp/datasets/upload.py b/src/cloudflare/resources/zero_trust/dlp/datasets/upload.py index f7e22a3a953..78dd45cc3ff 100644 --- a/src/cloudflare/resources/zero_trust/dlp/datasets/upload.py +++ b/src/cloudflare/resources/zero_trust/dlp/datasets/upload.py @@ -23,8 +23,9 @@ from ....._base_client import ( make_request_options, ) -from .....types.zero_trust.dlp import Dataset -from .....types.zero_trust.dlp.datasets import NewVersion, upload_edit_params +from .....types.zero_trust.dlp.dataset import Dataset +from .....types.zero_trust.dlp.datasets import upload_edit_params +from .....types.zero_trust.dlp.datasets.new_version import NewVersion __all__ = ["Upload", "AsyncUpload"] diff --git a/src/cloudflare/resources/zero_trust/dlp/patterns.py b/src/cloudflare/resources/zero_trust/dlp/patterns.py index cccad36e65f..6c4c158d4a5 100644 --- a/src/cloudflare/resources/zero_trust/dlp/patterns.py +++ b/src/cloudflare/resources/zero_trust/dlp/patterns.py @@ -23,8 +23,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.logpush import OwnershipValidation from ....types.zero_trust.dlp import pattern_validate_params +from ....types.logpush.ownership_validation import OwnershipValidation __all__ = ["Patterns", "AsyncPatterns"] diff --git a/src/cloudflare/resources/zero_trust/dlp/payload_logs.py b/src/cloudflare/resources/zero_trust/dlp/payload_logs.py index e8147bba578..1d82f9edfda 100644 --- a/src/cloudflare/resources/zero_trust/dlp/payload_logs.py +++ b/src/cloudflare/resources/zero_trust/dlp/payload_logs.py @@ -23,7 +23,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.zero_trust.dlp import PayloadLogGetResponse, PayloadLogUpdateResponse, payload_log_update_params +from ....types.zero_trust.dlp import payload_log_update_params +from ....types.zero_trust.dlp.payload_log_get_response import PayloadLogGetResponse +from ....types.zero_trust.dlp.payload_log_update_response import PayloadLogUpdateResponse __all__ = ["PayloadLogs", "AsyncPayloadLogs"] diff --git a/src/cloudflare/resources/zero_trust/dlp/profiles/custom.py b/src/cloudflare/resources/zero_trust/dlp/profiles/custom.py index d2c05e070c8..a6d64bacf6d 100644 --- a/src/cloudflare/resources/zero_trust/dlp/profiles/custom.py +++ b/src/cloudflare/resources/zero_trust/dlp/profiles/custom.py @@ -23,15 +23,11 @@ from ....._base_client import ( make_request_options, ) -from .....types.zero_trust.dlp import ContextAwarenessParam -from .....types.zero_trust.dlp.profiles import ( - CustomProfile, - CustomCreateResponse, - CustomDeleteResponse, - custom_create_params, - custom_delete_params, - custom_update_params, -) +from .....types.zero_trust.dlp.profiles import custom_create_params, custom_delete_params, custom_update_params +from .....types.zero_trust.dlp.context_awareness_param import ContextAwarenessParam +from .....types.zero_trust.dlp.profiles.custom_profile import CustomProfile +from .....types.zero_trust.dlp.profiles.custom_create_response import CustomCreateResponse +from .....types.zero_trust.dlp.profiles.custom_delete_response import CustomDeleteResponse __all__ = ["Custom", "AsyncCustom"] diff --git a/src/cloudflare/resources/zero_trust/dlp/profiles/predefined.py b/src/cloudflare/resources/zero_trust/dlp/profiles/predefined.py index ee459edab8f..96f794419ed 100644 --- a/src/cloudflare/resources/zero_trust/dlp/profiles/predefined.py +++ b/src/cloudflare/resources/zero_trust/dlp/profiles/predefined.py @@ -23,8 +23,9 @@ from ....._base_client import ( make_request_options, ) -from .....types.zero_trust.dlp import ContextAwarenessParam -from .....types.zero_trust.dlp.profiles import PredefinedProfile, predefined_update_params +from .....types.zero_trust.dlp.profiles import predefined_update_params +from .....types.zero_trust.dlp.context_awareness_param import ContextAwarenessParam +from .....types.zero_trust.dlp.profiles.predefined_profile import PredefinedProfile __all__ = ["Predefined", "AsyncPredefined"] diff --git a/src/cloudflare/resources/zero_trust/dlp/profiles/profiles.py b/src/cloudflare/resources/zero_trust/dlp/profiles/profiles.py index c07bb07244f..6d701a1cd72 100644 --- a/src/cloudflare/resources/zero_trust/dlp/profiles/profiles.py +++ b/src/cloudflare/resources/zero_trust/dlp/profiles/profiles.py @@ -37,7 +37,8 @@ AsyncPaginator, make_request_options, ) -from .....types.zero_trust.dlp import Profile, ProfileGetResponse +from .....types.zero_trust.dlp.profile import Profile +from .....types.zero_trust.dlp.profile_get_response import ProfileGetResponse __all__ = ["Profiles", "AsyncProfiles"] diff --git a/src/cloudflare/resources/zero_trust/gateway/app_types.py b/src/cloudflare/resources/zero_trust/gateway/app_types.py index 890582a30dd..e0e6e990f15 100644 --- a/src/cloudflare/resources/zero_trust/gateway/app_types.py +++ b/src/cloudflare/resources/zero_trust/gateway/app_types.py @@ -20,7 +20,7 @@ AsyncPaginator, make_request_options, ) -from ....types.zero_trust.gateway import AppType +from ....types.zero_trust.gateway.app_type import AppType __all__ = ["AppTypes", "AsyncAppTypes"] diff --git a/src/cloudflare/resources/zero_trust/gateway/audit_ssh_settings.py b/src/cloudflare/resources/zero_trust/gateway/audit_ssh_settings.py index 56fad0b2e72..59aa8b46ab9 100644 --- a/src/cloudflare/resources/zero_trust/gateway/audit_ssh_settings.py +++ b/src/cloudflare/resources/zero_trust/gateway/audit_ssh_settings.py @@ -23,7 +23,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zero_trust.gateway import GatewaySettings, audit_ssh_setting_update_params +from ....types.zero_trust.gateway import audit_ssh_setting_update_params +from ....types.zero_trust.gateway.gateway_settings import GatewaySettings __all__ = ["AuditSSHSettings", "AsyncAuditSSHSettings"] diff --git a/src/cloudflare/resources/zero_trust/gateway/categories.py b/src/cloudflare/resources/zero_trust/gateway/categories.py index d76bcc4f71b..e6ddf46d11b 100644 --- a/src/cloudflare/resources/zero_trust/gateway/categories.py +++ b/src/cloudflare/resources/zero_trust/gateway/categories.py @@ -18,7 +18,7 @@ AsyncPaginator, make_request_options, ) -from ....types.zero_trust.gateway import Category +from ....types.zero_trust.gateway.category import Category __all__ = ["Categories", "AsyncCategories"] diff --git a/src/cloudflare/resources/zero_trust/gateway/configurations.py b/src/cloudflare/resources/zero_trust/gateway/configurations.py index aa355c7784c..e440e974f29 100644 --- a/src/cloudflare/resources/zero_trust/gateway/configurations.py +++ b/src/cloudflare/resources/zero_trust/gateway/configurations.py @@ -24,13 +24,13 @@ make_request_options, ) from ....types.zero_trust.gateway import ( - ConfigurationGetResponse, - ConfigurationEditResponse, - ConfigurationUpdateResponse, - GatewayConfigurationSettingsParam, configuration_edit_params, configuration_update_params, ) +from ....types.zero_trust.gateway.configuration_get_response import ConfigurationGetResponse +from ....types.zero_trust.gateway.configuration_edit_response import ConfigurationEditResponse +from ....types.zero_trust.gateway.configuration_update_response import ConfigurationUpdateResponse +from ....types.zero_trust.gateway.gateway_configuration_settings_param import GatewayConfigurationSettingsParam __all__ = ["Configurations", "AsyncConfigurations"] diff --git a/src/cloudflare/resources/zero_trust/gateway/gateway.py b/src/cloudflare/resources/zero_trust/gateway/gateway.py index 0f16f0b040f..30e9a442118 100644 --- a/src/cloudflare/resources/zero_trust/gateway/gateway.py +++ b/src/cloudflare/resources/zero_trust/gateway/gateway.py @@ -92,7 +92,8 @@ AuditSSHSettingsWithStreamingResponse, AsyncAuditSSHSettingsWithStreamingResponse, ) -from ....types.zero_trust import GatewayListResponse, GatewayCreateResponse +from ....types.zero_trust.gateway_list_response import GatewayListResponse +from ....types.zero_trust.gateway_create_response import GatewayCreateResponse __all__ = ["Gateway", "AsyncGateway"] diff --git a/src/cloudflare/resources/zero_trust/gateway/lists/items.py b/src/cloudflare/resources/zero_trust/gateway/lists/items.py index ef83861be8d..3f53aa48895 100644 --- a/src/cloudflare/resources/zero_trust/gateway/lists/items.py +++ b/src/cloudflare/resources/zero_trust/gateway/lists/items.py @@ -18,7 +18,7 @@ AsyncPaginator, make_request_options, ) -from .....types.zero_trust.gateway.lists import ItemListResponse +from .....types.zero_trust.gateway.lists.item_list_response import ItemListResponse __all__ = ["Items", "AsyncItems"] diff --git a/src/cloudflare/resources/zero_trust/gateway/lists/lists.py b/src/cloudflare/resources/zero_trust/gateway/lists/lists.py index 506f8f85cba..c4ebb31107b 100644 --- a/src/cloudflare/resources/zero_trust/gateway/lists/lists.py +++ b/src/cloudflare/resources/zero_trust/gateway/lists/lists.py @@ -34,16 +34,11 @@ AsyncPaginator, make_request_options, ) -from .....types.zero_trust.gateway import ( - GatewayList, - GatewayItemParam, - ListCreateResponse, - ListDeleteResponse, - list_edit_params, - list_create_params, - list_delete_params, - list_update_params, -) +from .....types.zero_trust.gateway import list_edit_params, list_create_params, list_delete_params, list_update_params +from .....types.zero_trust.gateway.gateway_list import GatewayList +from .....types.zero_trust.gateway.gateway_item_param import GatewayItemParam +from .....types.zero_trust.gateway.list_create_response import ListCreateResponse +from .....types.zero_trust.gateway.list_delete_response import ListDeleteResponse __all__ = ["Lists", "AsyncLists"] diff --git a/src/cloudflare/resources/zero_trust/gateway/locations.py b/src/cloudflare/resources/zero_trust/gateway/locations.py index 124003afd36..ea7f0d05410 100644 --- a/src/cloudflare/resources/zero_trust/gateway/locations.py +++ b/src/cloudflare/resources/zero_trust/gateway/locations.py @@ -25,14 +25,10 @@ AsyncPaginator, make_request_options, ) -from ....types.zero_trust.gateway import ( - Location, - LocationNetworkParam, - LocationDeleteResponse, - location_create_params, - location_delete_params, - location_update_params, -) +from ....types.zero_trust.gateway import location_create_params, location_delete_params, location_update_params +from ....types.zero_trust.gateway.location import Location +from ....types.zero_trust.gateway.location_network_param import LocationNetworkParam +from ....types.zero_trust.gateway.location_delete_response import LocationDeleteResponse __all__ = ["Locations", "AsyncLocations"] diff --git a/src/cloudflare/resources/zero_trust/gateway/logging.py b/src/cloudflare/resources/zero_trust/gateway/logging.py index 48862f6ebc4..ad08da0c500 100644 --- a/src/cloudflare/resources/zero_trust/gateway/logging.py +++ b/src/cloudflare/resources/zero_trust/gateway/logging.py @@ -23,7 +23,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zero_trust.gateway import LoggingSetting, logging_update_params +from ....types.zero_trust.gateway import logging_update_params +from ....types.zero_trust.gateway.logging_setting import LoggingSetting __all__ = ["Logging", "AsyncLogging"] diff --git a/src/cloudflare/resources/zero_trust/gateway/proxy_endpoints.py b/src/cloudflare/resources/zero_trust/gateway/proxy_endpoints.py index 43cfc41f522..37954fa2e6d 100644 --- a/src/cloudflare/resources/zero_trust/gateway/proxy_endpoints.py +++ b/src/cloudflare/resources/zero_trust/gateway/proxy_endpoints.py @@ -26,13 +26,13 @@ make_request_options, ) from ....types.zero_trust.gateway import ( - GatewayIPs, - ProxyEndpoint, - ProxyEndpointDeleteResponse, proxy_endpoint_edit_params, proxy_endpoint_create_params, proxy_endpoint_delete_params, ) +from ....types.zero_trust.gateway.gateway_ips import GatewayIPs +from ....types.zero_trust.gateway.proxy_endpoint import ProxyEndpoint +from ....types.zero_trust.gateway.proxy_endpoint_delete_response import ProxyEndpointDeleteResponse __all__ = ["ProxyEndpoints", "AsyncProxyEndpoints"] diff --git a/src/cloudflare/resources/zero_trust/gateway/rules.py b/src/cloudflare/resources/zero_trust/gateway/rules.py index 4f2f74f9305..5d6e506e833 100644 --- a/src/cloudflare/resources/zero_trust/gateway/rules.py +++ b/src/cloudflare/resources/zero_trust/gateway/rules.py @@ -27,15 +27,15 @@ make_request_options, ) from ....types.zero_trust.gateway import ( - GatewayRule, - GatewayFilter, - ScheduleParam, - RuleSettingParam, - RuleDeleteResponse, rule_create_params, rule_delete_params, rule_update_params, ) +from ....types.zero_trust.gateway.gateway_rule import GatewayRule +from ....types.zero_trust.gateway.gateway_filter import GatewayFilter +from ....types.zero_trust.gateway.schedule_param import ScheduleParam +from ....types.zero_trust.gateway.rule_setting_param import RuleSettingParam +from ....types.zero_trust.gateway.rule_delete_response import RuleDeleteResponse __all__ = ["Rules", "AsyncRules"] diff --git a/src/cloudflare/resources/zero_trust/identity_providers.py b/src/cloudflare/resources/zero_trust/identity_providers.py index 27dfae6bbc1..4e3dbaee8b9 100644 --- a/src/cloudflare/resources/zero_trust/identity_providers.py +++ b/src/cloudflare/resources/zero_trust/identity_providers.py @@ -27,15 +27,16 @@ make_request_options, ) from ...types.zero_trust import ( - ScimConfigParam, - IdentityProvider, IdentityProviderType, - GenericOAuthConfigParam, - IdentityProviderListResponse, - IdentityProviderDeleteResponse, identity_provider_create_params, identity_provider_update_params, ) +from ...types.zero_trust.identity_provider import IdentityProvider +from ...types.zero_trust.scim_config_param import ScimConfigParam +from ...types.zero_trust.identity_provider_type import IdentityProviderType +from ...types.zero_trust.generic_oauth_config_param import GenericOAuthConfigParam +from ...types.zero_trust.identity_provider_list_response import IdentityProviderListResponse +from ...types.zero_trust.identity_provider_delete_response import IdentityProviderDeleteResponse __all__ = ["IdentityProviders", "AsyncIdentityProviders"] diff --git a/src/cloudflare/resources/zero_trust/networks/routes/ips.py b/src/cloudflare/resources/zero_trust/networks/routes/ips.py index c6c13df0ded..79b592ff86b 100644 --- a/src/cloudflare/resources/zero_trust/networks/routes/ips.py +++ b/src/cloudflare/resources/zero_trust/networks/routes/ips.py @@ -23,8 +23,8 @@ from ....._base_client import ( make_request_options, ) -from .....types.zero_trust.networks import Teamnet from .....types.zero_trust.networks.routes import ip_get_params +from .....types.zero_trust.networks.teamnet import Teamnet __all__ = ["IPs", "AsyncIPs"] diff --git a/src/cloudflare/resources/zero_trust/networks/routes/networks.py b/src/cloudflare/resources/zero_trust/networks/routes/networks.py index 0d11f42eac5..4cd3feac690 100644 --- a/src/cloudflare/resources/zero_trust/networks/routes/networks.py +++ b/src/cloudflare/resources/zero_trust/networks/routes/networks.py @@ -24,7 +24,7 @@ from ....._base_client import ( make_request_options, ) -from .....types.zero_trust.networks import Route +from .....types.zero_trust.networks.route import Route from .....types.zero_trust.networks.routes import network_create_params, network_delete_params __all__ = ["Networks", "AsyncNetworks"] diff --git a/src/cloudflare/resources/zero_trust/networks/routes/routes.py b/src/cloudflare/resources/zero_trust/networks/routes/routes.py index 7d4ff3d434d..0bbd100f0f3 100644 --- a/src/cloudflare/resources/zero_trust/networks/routes/routes.py +++ b/src/cloudflare/resources/zero_trust/networks/routes/routes.py @@ -42,7 +42,9 @@ AsyncPaginator, make_request_options, ) -from .....types.zero_trust.networks import Route, Teamnet, route_edit_params, route_list_params, route_create_params +from .....types.zero_trust.networks import route_edit_params, route_list_params, route_create_params +from .....types.zero_trust.networks.route import Route +from .....types.zero_trust.networks.teamnet import Teamnet __all__ = ["Routes", "AsyncRoutes"] diff --git a/src/cloudflare/resources/zero_trust/networks/virtual_networks.py b/src/cloudflare/resources/zero_trust/networks/virtual_networks.py index 1d066df2ba2..c0ef4864e64 100644 --- a/src/cloudflare/resources/zero_trust/networks/virtual_networks.py +++ b/src/cloudflare/resources/zero_trust/networks/virtual_networks.py @@ -26,15 +26,15 @@ make_request_options, ) from ....types.zero_trust.networks import ( - VirtualNetwork, - VirtualNetworkEditResponse, - VirtualNetworkCreateResponse, - VirtualNetworkDeleteResponse, virtual_network_edit_params, virtual_network_list_params, virtual_network_create_params, virtual_network_delete_params, ) +from ....types.zero_trust.networks.virtual_network import VirtualNetwork +from ....types.zero_trust.networks.virtual_network_edit_response import VirtualNetworkEditResponse +from ....types.zero_trust.networks.virtual_network_create_response import VirtualNetworkCreateResponse +from ....types.zero_trust.networks.virtual_network_delete_response import VirtualNetworkDeleteResponse __all__ = ["VirtualNetworks", "AsyncVirtualNetworks"] diff --git a/src/cloudflare/resources/zero_trust/organizations.py b/src/cloudflare/resources/zero_trust/organizations.py index 23985a301a2..6dfa8917d28 100644 --- a/src/cloudflare/resources/zero_trust/organizations.py +++ b/src/cloudflare/resources/zero_trust/organizations.py @@ -24,13 +24,13 @@ make_request_options, ) from ...types.zero_trust import ( - Organization, - LoginDesignParam, - OrganizationRevokeUsersResponse, organization_create_params, organization_update_params, organization_revoke_users_params, ) +from ...types.zero_trust.organization import Organization +from ...types.zero_trust.login_design_param import LoginDesignParam +from ...types.zero_trust.organization_revoke_users_response import OrganizationRevokeUsersResponse __all__ = ["Organizations", "AsyncOrganizations"] diff --git a/src/cloudflare/resources/zero_trust/risk_scoring/behaviours.py b/src/cloudflare/resources/zero_trust/risk_scoring/behaviours.py index 9690e7108cd..392eeefb291 100644 --- a/src/cloudflare/resources/zero_trust/risk_scoring/behaviours.py +++ b/src/cloudflare/resources/zero_trust/risk_scoring/behaviours.py @@ -23,7 +23,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.zero_trust.risk_scoring import BehaviourGetResponse, BehaviourUpdateResponse, behaviour_update_params +from ....types.zero_trust.risk_scoring import behaviour_update_params +from ....types.zero_trust.risk_scoring.behaviour_get_response import BehaviourGetResponse +from ....types.zero_trust.risk_scoring.behaviour_update_response import BehaviourUpdateResponse __all__ = ["Behaviours", "AsyncBehaviours"] diff --git a/src/cloudflare/resources/zero_trust/risk_scoring/risk_scoring.py b/src/cloudflare/resources/zero_trust/risk_scoring/risk_scoring.py index 2035a4118eb..a42287ee76f 100644 --- a/src/cloudflare/resources/zero_trust/risk_scoring/risk_scoring.py +++ b/src/cloudflare/resources/zero_trust/risk_scoring/risk_scoring.py @@ -40,7 +40,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.zero_trust import RiskScoringGetResponse, RiskScoringResetResponse, risk_scoring_get_params +from ....types.zero_trust import risk_scoring_get_params +from ....types.zero_trust.risk_scoring_get_response import RiskScoringGetResponse +from ....types.zero_trust.risk_scoring_reset_response import RiskScoringResetResponse __all__ = ["RiskScoring", "AsyncRiskScoring"] diff --git a/src/cloudflare/resources/zero_trust/risk_scoring/summary.py b/src/cloudflare/resources/zero_trust/risk_scoring/summary.py index 2494f380c97..c0d3323d05f 100644 --- a/src/cloudflare/resources/zero_trust/risk_scoring/summary.py +++ b/src/cloudflare/resources/zero_trust/risk_scoring/summary.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zero_trust.risk_scoring import SummaryGetResponse, summary_get_params +from ....types.zero_trust.risk_scoring import summary_get_params +from ....types.zero_trust.risk_scoring.summary_get_response import SummaryGetResponse __all__ = ["Summary", "AsyncSummary"] diff --git a/src/cloudflare/resources/zero_trust/seats.py b/src/cloudflare/resources/zero_trust/seats.py index 2cc9f7beec8..79fc9544c27 100644 --- a/src/cloudflare/resources/zero_trust/seats.py +++ b/src/cloudflare/resources/zero_trust/seats.py @@ -23,7 +23,8 @@ from ..._base_client import ( make_request_options, ) -from ...types.zero_trust import SeatEditResponse, seat_edit_params +from ...types.zero_trust import seat_edit_params +from ...types.zero_trust.seat_edit_response import SeatEditResponse __all__ = ["Seats", "AsyncSeats"] diff --git a/src/cloudflare/resources/zero_trust/tunnels/configurations.py b/src/cloudflare/resources/zero_trust/tunnels/configurations.py index f048c1c312d..f83b800a80d 100644 --- a/src/cloudflare/resources/zero_trust/tunnels/configurations.py +++ b/src/cloudflare/resources/zero_trust/tunnels/configurations.py @@ -23,11 +23,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.zero_trust.tunnels import ( - ConfigurationGetResponse, - ConfigurationUpdateResponse, - configuration_update_params, -) +from ....types.zero_trust.tunnels import configuration_update_params +from ....types.zero_trust.tunnels.configuration_get_response import ConfigurationGetResponse +from ....types.zero_trust.tunnels.configuration_update_response import ConfigurationUpdateResponse __all__ = ["Configurations", "AsyncConfigurations"] diff --git a/src/cloudflare/resources/zero_trust/tunnels/connections.py b/src/cloudflare/resources/zero_trust/tunnels/connections.py index 695cbce1354..a91fdd17497 100644 --- a/src/cloudflare/resources/zero_trust/tunnels/connections.py +++ b/src/cloudflare/resources/zero_trust/tunnels/connections.py @@ -23,7 +23,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.zero_trust.tunnels import ConnectionGetResponse, ConnectionDeleteResponse, connection_delete_params +from ....types.zero_trust.tunnels import connection_delete_params +from ....types.zero_trust.tunnels.connection_get_response import ConnectionGetResponse +from ....types.zero_trust.tunnels.connection_delete_response import ConnectionDeleteResponse __all__ = ["Connections", "AsyncConnections"] diff --git a/src/cloudflare/resources/zero_trust/tunnels/connectors.py b/src/cloudflare/resources/zero_trust/tunnels/connectors.py index cb88abec33e..b8af6c8d823 100644 --- a/src/cloudflare/resources/zero_trust/tunnels/connectors.py +++ b/src/cloudflare/resources/zero_trust/tunnels/connectors.py @@ -19,7 +19,7 @@ from ...._base_client import ( make_request_options, ) -from ....types.zero_trust.tunnels import Client +from ....types.zero_trust.tunnels.client import Client __all__ = ["Connectors", "AsyncConnectors"] diff --git a/src/cloudflare/resources/zero_trust/tunnels/management.py b/src/cloudflare/resources/zero_trust/tunnels/management.py index 5eeefc355d7..fbc186858d9 100644 --- a/src/cloudflare/resources/zero_trust/tunnels/management.py +++ b/src/cloudflare/resources/zero_trust/tunnels/management.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zero_trust.tunnels import ManagementCreateResponse, management_create_params +from ....types.zero_trust.tunnels import management_create_params +from ....types.zero_trust.tunnels.management_create_response import ManagementCreateResponse __all__ = ["Management", "AsyncManagement"] diff --git a/src/cloudflare/resources/zero_trust/tunnels/token.py b/src/cloudflare/resources/zero_trust/tunnels/token.py index 8510887f028..e8e21517d40 100644 --- a/src/cloudflare/resources/zero_trust/tunnels/token.py +++ b/src/cloudflare/resources/zero_trust/tunnels/token.py @@ -19,7 +19,7 @@ from ...._base_client import ( make_request_options, ) -from ....types.zero_trust.tunnels import TokenGetResponse +from ....types.zero_trust.tunnels.token_get_response import TokenGetResponse __all__ = ["Token", "AsyncToken"] diff --git a/src/cloudflare/resources/zero_trust/tunnels/tunnels.py b/src/cloudflare/resources/zero_trust/tunnels/tunnels.py index e990d14ff10..b6e590910cb 100644 --- a/src/cloudflare/resources/zero_trust/tunnels/tunnels.py +++ b/src/cloudflare/resources/zero_trust/tunnels/tunnels.py @@ -66,17 +66,12 @@ AsyncPaginator, make_request_options, ) -from ....types.zero_trust import ( - TunnelGetResponse, - TunnelEditResponse, - TunnelListResponse, - TunnelCreateResponse, - TunnelDeleteResponse, - tunnel_edit_params, - tunnel_list_params, - tunnel_create_params, - tunnel_delete_params, -) +from ....types.zero_trust import tunnel_edit_params, tunnel_list_params, tunnel_create_params, tunnel_delete_params +from ....types.zero_trust.tunnel_get_response import TunnelGetResponse +from ....types.zero_trust.tunnel_edit_response import TunnelEditResponse +from ....types.zero_trust.tunnel_list_response import TunnelListResponse +from ....types.zero_trust.tunnel_create_response import TunnelCreateResponse +from ....types.zero_trust.tunnel_delete_response import TunnelDeleteResponse __all__ = ["Tunnels", "AsyncTunnels"] diff --git a/src/cloudflare/resources/zones/activation_check.py b/src/cloudflare/resources/zones/activation_check.py index 473145a2821..0ba1dc39d5b 100644 --- a/src/cloudflare/resources/zones/activation_check.py +++ b/src/cloudflare/resources/zones/activation_check.py @@ -16,10 +16,10 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.zones import ActivationCheckTriggerResponse from ..._base_client import ( make_request_options, ) +from ...types.zones.activation_check_trigger_response import ActivationCheckTriggerResponse __all__ = ["ActivationCheck", "AsyncActivationCheck"] diff --git a/src/cloudflare/resources/zones/custom_nameservers.py b/src/cloudflare/resources/zones/custom_nameservers.py index e0d63e05ec3..6b7a106db47 100644 --- a/src/cloudflare/resources/zones/custom_nameservers.py +++ b/src/cloudflare/resources/zones/custom_nameservers.py @@ -20,10 +20,12 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.zones import CustomNameserverGetResponse, CustomNameserverUpdateResponse, custom_nameserver_update_params +from ...types.zones import custom_nameserver_update_params from ..._base_client import ( make_request_options, ) +from ...types.zones.custom_nameserver_get_response import CustomNameserverGetResponse +from ...types.zones.custom_nameserver_update_response import CustomNameserverUpdateResponse __all__ = ["CustomNameservers", "AsyncCustomNameservers"] diff --git a/src/cloudflare/resources/zones/dns_settings.py b/src/cloudflare/resources/zones/dns_settings.py index 970c1952c87..56fdb3a76f0 100644 --- a/src/cloudflare/resources/zones/dns_settings.py +++ b/src/cloudflare/resources/zones/dns_settings.py @@ -20,10 +20,12 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.zones import DNSSetting, NameserverParam, dns_setting_edit_params +from ...types.zones import dns_setting_edit_params from ..._base_client import ( make_request_options, ) +from ...types.zones.dns_setting import DNSSetting +from ...types.zones.nameserver_param import NameserverParam __all__ = ["DNSSettings", "AsyncDNSSettings"] diff --git a/src/cloudflare/resources/zones/holds.py b/src/cloudflare/resources/zones/holds.py index 51fe22d4519..ee20c4f40b9 100644 --- a/src/cloudflare/resources/zones/holds.py +++ b/src/cloudflare/resources/zones/holds.py @@ -20,10 +20,11 @@ async_to_streamed_response_wrapper, ) from ..._wrappers import ResultWrapper -from ...types.zones import ZoneHold, hold_create_params, hold_delete_params +from ...types.zones import hold_create_params, hold_delete_params from ..._base_client import ( make_request_options, ) +from ...types.zones.zone_hold import ZoneHold __all__ = ["Holds", "AsyncHolds"] diff --git a/src/cloudflare/resources/zones/settings/always_online.py b/src/cloudflare/resources/zones/settings/always_online.py index 805d8ba9255..df0c7324373 100644 --- a/src/cloudflare/resources/zones/settings/always_online.py +++ b/src/cloudflare/resources/zones/settings/always_online.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import AlwaysOnline, always_online_edit_params +from ....types.zones.settings import always_online_edit_params +from ....types.zones.settings.always_online import AlwaysOnline __all__ = ["AlwaysOnlineResource", "AsyncAlwaysOnlineResource"] diff --git a/src/cloudflare/resources/zones/settings/automatic_platform_optimization.py b/src/cloudflare/resources/zones/settings/automatic_platform_optimization.py index e550faa6fe3..5bb239a25aa 100644 --- a/src/cloudflare/resources/zones/settings/automatic_platform_optimization.py +++ b/src/cloudflare/resources/zones/settings/automatic_platform_optimization.py @@ -23,11 +23,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import ( - AutomaticPlatformOptimization, - AutomaticPlatformOptimizationParam, - automatic_platform_optimization_edit_params, -) +from ....types.zones.settings import AutomaticPlatformOptimization, automatic_platform_optimization_edit_params +from ....types.zones.settings.automatic_platform_optimization import AutomaticPlatformOptimization +from ....types.zones.settings.automatic_platform_optimization_param import AutomaticPlatformOptimizationParam __all__ = ["AutomaticPlatformOptimizationResource", "AsyncAutomaticPlatformOptimizationResource"] diff --git a/src/cloudflare/resources/zones/settings/brotli.py b/src/cloudflare/resources/zones/settings/brotli.py index 520e92d85aa..33912623ca6 100644 --- a/src/cloudflare/resources/zones/settings/brotli.py +++ b/src/cloudflare/resources/zones/settings/brotli.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import Brotli, brotli_edit_params +from ....types.zones.settings import brotli_edit_params +from ....types.zones.settings.brotli import Brotli __all__ = ["BrotliResource", "AsyncBrotliResource"] diff --git a/src/cloudflare/resources/zones/settings/browser_cache_ttl.py b/src/cloudflare/resources/zones/settings/browser_cache_ttl.py index 347a01c60a8..56eb8d8c62c 100644 --- a/src/cloudflare/resources/zones/settings/browser_cache_ttl.py +++ b/src/cloudflare/resources/zones/settings/browser_cache_ttl.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import BrowserCacheTTL, browser_cache_ttl_edit_params +from ....types.zones.settings import browser_cache_ttl_edit_params +from ....types.zones.settings.browser_cache_ttl import BrowserCacheTTL __all__ = ["BrowserCacheTTLResource", "AsyncBrowserCacheTTLResource"] diff --git a/src/cloudflare/resources/zones/settings/browser_check.py b/src/cloudflare/resources/zones/settings/browser_check.py index f7b0e5f9ea4..20516575677 100644 --- a/src/cloudflare/resources/zones/settings/browser_check.py +++ b/src/cloudflare/resources/zones/settings/browser_check.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import BrowserCheck, browser_check_edit_params +from ....types.zones.settings import browser_check_edit_params +from ....types.zones.settings.browser_check import BrowserCheck __all__ = ["BrowserCheckResource", "AsyncBrowserCheckResource"] diff --git a/src/cloudflare/resources/zones/settings/cache_level.py b/src/cloudflare/resources/zones/settings/cache_level.py index 0f3df56516e..444c3b71f2c 100644 --- a/src/cloudflare/resources/zones/settings/cache_level.py +++ b/src/cloudflare/resources/zones/settings/cache_level.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import CacheLevel, cache_level_edit_params +from ....types.zones.settings import cache_level_edit_params +from ....types.zones.settings.cache_level import CacheLevel __all__ = ["CacheLevelResource", "AsyncCacheLevelResource"] diff --git a/src/cloudflare/resources/zones/settings/challenge_ttl.py b/src/cloudflare/resources/zones/settings/challenge_ttl.py index b38a47bb6ca..7730173627d 100644 --- a/src/cloudflare/resources/zones/settings/challenge_ttl.py +++ b/src/cloudflare/resources/zones/settings/challenge_ttl.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import ChallengeTTL, challenge_ttl_edit_params +from ....types.zones.settings import challenge_ttl_edit_params +from ....types.zones.settings.challenge_ttl import ChallengeTTL __all__ = ["ChallengeTTLResource", "AsyncChallengeTTLResource"] diff --git a/src/cloudflare/resources/zones/settings/development_mode.py b/src/cloudflare/resources/zones/settings/development_mode.py index fa6525e36ff..d5a609c139a 100644 --- a/src/cloudflare/resources/zones/settings/development_mode.py +++ b/src/cloudflare/resources/zones/settings/development_mode.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import DevelopmentMode, development_mode_edit_params +from ....types.zones.settings import development_mode_edit_params +from ....types.zones.settings.development_mode import DevelopmentMode __all__ = ["DevelopmentModeResource", "AsyncDevelopmentModeResource"] diff --git a/src/cloudflare/resources/zones/settings/email_obfuscation.py b/src/cloudflare/resources/zones/settings/email_obfuscation.py index 29d4af4f39a..da8a7e0e288 100644 --- a/src/cloudflare/resources/zones/settings/email_obfuscation.py +++ b/src/cloudflare/resources/zones/settings/email_obfuscation.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import EmailObfuscation, email_obfuscation_edit_params +from ....types.zones.settings import email_obfuscation_edit_params +from ....types.zones.settings.email_obfuscation import EmailObfuscation __all__ = ["EmailObfuscationResource", "AsyncEmailObfuscationResource"] diff --git a/src/cloudflare/resources/zones/settings/h2_prioritization.py b/src/cloudflare/resources/zones/settings/h2_prioritization.py index 838514d2e2d..51c445962bc 100644 --- a/src/cloudflare/resources/zones/settings/h2_prioritization.py +++ b/src/cloudflare/resources/zones/settings/h2_prioritization.py @@ -23,7 +23,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import H2Prioritization, H2PrioritizationParam, h2_prioritization_edit_params +from ....types.zones.settings import H2Prioritization, h2_prioritization_edit_params +from ....types.zones.settings.h2_prioritization import H2Prioritization +from ....types.zones.settings.h2_prioritization_param import H2PrioritizationParam __all__ = ["H2PrioritizationResource", "AsyncH2PrioritizationResource"] diff --git a/src/cloudflare/resources/zones/settings/hotlink_protection.py b/src/cloudflare/resources/zones/settings/hotlink_protection.py index ed2b73875f3..0b42ae6747d 100644 --- a/src/cloudflare/resources/zones/settings/hotlink_protection.py +++ b/src/cloudflare/resources/zones/settings/hotlink_protection.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import HotlinkProtection, hotlink_protection_edit_params +from ....types.zones.settings import hotlink_protection_edit_params +from ....types.zones.settings.hotlink_protection import HotlinkProtection __all__ = ["HotlinkProtectionResource", "AsyncHotlinkProtectionResource"] diff --git a/src/cloudflare/resources/zones/settings/http2.py b/src/cloudflare/resources/zones/settings/http2.py index 017c6208806..8b545d2e20d 100644 --- a/src/cloudflare/resources/zones/settings/http2.py +++ b/src/cloudflare/resources/zones/settings/http2.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import HTTP2, http2_edit_params +from ....types.zones.settings import http2_edit_params +from ....types.zones.settings.http2 import HTTP2 __all__ = ["HTTP2Resource", "AsyncHTTP2Resource"] diff --git a/src/cloudflare/resources/zones/settings/http3.py b/src/cloudflare/resources/zones/settings/http3.py index c75d8fa48f0..cd32293b83a 100644 --- a/src/cloudflare/resources/zones/settings/http3.py +++ b/src/cloudflare/resources/zones/settings/http3.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import HTTP3, http3_edit_params +from ....types.zones.settings import http3_edit_params +from ....types.zones.settings.http3 import HTTP3 __all__ = ["HTTP3Resource", "AsyncHTTP3Resource"] diff --git a/src/cloudflare/resources/zones/settings/image_resizing.py b/src/cloudflare/resources/zones/settings/image_resizing.py index e804dea88a1..417638b4d67 100644 --- a/src/cloudflare/resources/zones/settings/image_resizing.py +++ b/src/cloudflare/resources/zones/settings/image_resizing.py @@ -23,7 +23,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import ImageResizing, ImageResizingParam, image_resizing_edit_params +from ....types.zones.settings import ImageResizing, image_resizing_edit_params +from ....types.zones.settings.image_resizing import ImageResizing +from ....types.zones.settings.image_resizing_param import ImageResizingParam __all__ = ["ImageResizingResource", "AsyncImageResizingResource"] diff --git a/src/cloudflare/resources/zones/settings/ip_geolocation.py b/src/cloudflare/resources/zones/settings/ip_geolocation.py index 9b0e6aa8db9..e46ca0373be 100644 --- a/src/cloudflare/resources/zones/settings/ip_geolocation.py +++ b/src/cloudflare/resources/zones/settings/ip_geolocation.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import IPGeolocation, ip_geolocation_edit_params +from ....types.zones.settings import ip_geolocation_edit_params +from ....types.zones.settings.ip_geolocation import IPGeolocation __all__ = ["IPGeolocationResource", "AsyncIPGeolocationResource"] diff --git a/src/cloudflare/resources/zones/settings/ipv6.py b/src/cloudflare/resources/zones/settings/ipv6.py index 39c34638553..5427997cfb8 100644 --- a/src/cloudflare/resources/zones/settings/ipv6.py +++ b/src/cloudflare/resources/zones/settings/ipv6.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import IPV6, ipv6_edit_params +from ....types.zones.settings import ipv6_edit_params +from ....types.zones.settings.ipv6 import IPV6 __all__ = ["IPV6Resource", "AsyncIPV6Resource"] diff --git a/src/cloudflare/resources/zones/settings/min_tls_version.py b/src/cloudflare/resources/zones/settings/min_tls_version.py index 128a18b9fbd..e497eb57709 100644 --- a/src/cloudflare/resources/zones/settings/min_tls_version.py +++ b/src/cloudflare/resources/zones/settings/min_tls_version.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import MinTLSVersion, min_tls_version_edit_params +from ....types.zones.settings import min_tls_version_edit_params +from ....types.zones.settings.min_tls_version import MinTLSVersion __all__ = ["MinTLSVersionResource", "AsyncMinTLSVersionResource"] diff --git a/src/cloudflare/resources/zones/settings/minify.py b/src/cloudflare/resources/zones/settings/minify.py index a5063c1e33b..695214c16ce 100644 --- a/src/cloudflare/resources/zones/settings/minify.py +++ b/src/cloudflare/resources/zones/settings/minify.py @@ -23,7 +23,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import Minify, minify_edit_params +from ....types.zones.settings import minify_edit_params +from ....types.zones.settings.minify import Minify __all__ = ["MinifyResource", "AsyncMinifyResource"] diff --git a/src/cloudflare/resources/zones/settings/mirage.py b/src/cloudflare/resources/zones/settings/mirage.py index 4744aaf4b26..3116f40060c 100644 --- a/src/cloudflare/resources/zones/settings/mirage.py +++ b/src/cloudflare/resources/zones/settings/mirage.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import Mirage, mirage_edit_params +from ....types.zones.settings import mirage_edit_params +from ....types.zones.settings.mirage import Mirage __all__ = ["MirageResource", "AsyncMirageResource"] diff --git a/src/cloudflare/resources/zones/settings/mobile_redirect.py b/src/cloudflare/resources/zones/settings/mobile_redirect.py index 79ede917a3c..8774da3fb24 100644 --- a/src/cloudflare/resources/zones/settings/mobile_redirect.py +++ b/src/cloudflare/resources/zones/settings/mobile_redirect.py @@ -23,7 +23,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import MobileRedirect, mobile_redirect_edit_params +from ....types.zones.settings import mobile_redirect_edit_params +from ....types.zones.settings.mobile_redirect import MobileRedirect __all__ = ["MobileRedirectResource", "AsyncMobileRedirectResource"] diff --git a/src/cloudflare/resources/zones/settings/nel.py b/src/cloudflare/resources/zones/settings/nel.py index cf5fa8f818a..325792ab4f1 100644 --- a/src/cloudflare/resources/zones/settings/nel.py +++ b/src/cloudflare/resources/zones/settings/nel.py @@ -23,7 +23,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import NEL, NELParam, nel_edit_params +from ....types.zones.settings import NEL, nel_edit_params +from ....types.zones.settings.nel import NEL +from ....types.zones.settings.nel_param import NELParam __all__ = ["NELResource", "AsyncNELResource"] diff --git a/src/cloudflare/resources/zones/settings/opportunistic_encryption.py b/src/cloudflare/resources/zones/settings/opportunistic_encryption.py index 016ec7d3825..dc2d9cb1ff1 100644 --- a/src/cloudflare/resources/zones/settings/opportunistic_encryption.py +++ b/src/cloudflare/resources/zones/settings/opportunistic_encryption.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import OpportunisticEncryption, opportunistic_encryption_edit_params +from ....types.zones.settings import opportunistic_encryption_edit_params +from ....types.zones.settings.opportunistic_encryption import OpportunisticEncryption __all__ = ["OpportunisticEncryptionResource", "AsyncOpportunisticEncryptionResource"] diff --git a/src/cloudflare/resources/zones/settings/opportunistic_onion.py b/src/cloudflare/resources/zones/settings/opportunistic_onion.py index f233c760418..50f3e225e33 100644 --- a/src/cloudflare/resources/zones/settings/opportunistic_onion.py +++ b/src/cloudflare/resources/zones/settings/opportunistic_onion.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import OpportunisticOnion, opportunistic_onion_edit_params +from ....types.zones.settings import opportunistic_onion_edit_params +from ....types.zones.settings.opportunistic_onion import OpportunisticOnion __all__ = ["OpportunisticOnionResource", "AsyncOpportunisticOnionResource"] diff --git a/src/cloudflare/resources/zones/settings/orange_to_orange.py b/src/cloudflare/resources/zones/settings/orange_to_orange.py index d26b8bdfc18..c302303ee37 100644 --- a/src/cloudflare/resources/zones/settings/orange_to_orange.py +++ b/src/cloudflare/resources/zones/settings/orange_to_orange.py @@ -23,7 +23,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import OrangeToOrange, OrangeToOrangeParam, orange_to_orange_edit_params +from ....types.zones.settings import OrangeToOrange, orange_to_orange_edit_params +from ....types.zones.settings.orange_to_orange import OrangeToOrange +from ....types.zones.settings.orange_to_orange_param import OrangeToOrangeParam __all__ = ["OrangeToOrangeResource", "AsyncOrangeToOrangeResource"] diff --git a/src/cloudflare/resources/zones/settings/origin_error_page_pass_thru.py b/src/cloudflare/resources/zones/settings/origin_error_page_pass_thru.py index dd2bfefa657..37a1bae6963 100644 --- a/src/cloudflare/resources/zones/settings/origin_error_page_pass_thru.py +++ b/src/cloudflare/resources/zones/settings/origin_error_page_pass_thru.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import OriginErrorPagePassThru, origin_error_page_pass_thru_edit_params +from ....types.zones.settings import origin_error_page_pass_thru_edit_params +from ....types.zones.settings.origin_error_page_pass_thru import OriginErrorPagePassThru __all__ = ["OriginErrorPagePassThruResource", "AsyncOriginErrorPagePassThruResource"] diff --git a/src/cloudflare/resources/zones/settings/origin_max_http_version.py b/src/cloudflare/resources/zones/settings/origin_max_http_version.py index 36719eef022..29a7f3fff2a 100644 --- a/src/cloudflare/resources/zones/settings/origin_max_http_version.py +++ b/src/cloudflare/resources/zones/settings/origin_max_http_version.py @@ -24,11 +24,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import ( - OriginMaxHTTPVersionGetResponse, - OriginMaxHTTPVersionEditResponse, - origin_max_http_version_edit_params, -) +from ....types.zones.settings import origin_max_http_version_edit_params +from ....types.zones.settings.origin_max_http_version_get_response import OriginMaxHTTPVersionGetResponse +from ....types.zones.settings.origin_max_http_version_edit_response import OriginMaxHTTPVersionEditResponse __all__ = ["OriginMaxHTTPVersionResource", "AsyncOriginMaxHTTPVersionResource"] diff --git a/src/cloudflare/resources/zones/settings/polish.py b/src/cloudflare/resources/zones/settings/polish.py index 97e4a86e7a8..9479d26bade 100644 --- a/src/cloudflare/resources/zones/settings/polish.py +++ b/src/cloudflare/resources/zones/settings/polish.py @@ -23,7 +23,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import Polish, PolishParam, polish_edit_params +from ....types.zones.settings import Polish, polish_edit_params +from ....types.zones.settings.polish import Polish +from ....types.zones.settings.polish_param import PolishParam __all__ = ["PolishResource", "AsyncPolishResource"] diff --git a/src/cloudflare/resources/zones/settings/prefetch_preload.py b/src/cloudflare/resources/zones/settings/prefetch_preload.py index 867551c1272..39e208ff405 100644 --- a/src/cloudflare/resources/zones/settings/prefetch_preload.py +++ b/src/cloudflare/resources/zones/settings/prefetch_preload.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import PrefetchPreload, prefetch_preload_edit_params +from ....types.zones.settings import prefetch_preload_edit_params +from ....types.zones.settings.prefetch_preload import PrefetchPreload __all__ = ["PrefetchPreloadResource", "AsyncPrefetchPreloadResource"] diff --git a/src/cloudflare/resources/zones/settings/proxy_read_timeout.py b/src/cloudflare/resources/zones/settings/proxy_read_timeout.py index b80014e311d..1fd18b0cf77 100644 --- a/src/cloudflare/resources/zones/settings/proxy_read_timeout.py +++ b/src/cloudflare/resources/zones/settings/proxy_read_timeout.py @@ -23,7 +23,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import ProxyReadTimeout, ProxyReadTimeoutParam, proxy_read_timeout_edit_params +from ....types.zones.settings import ProxyReadTimeout, proxy_read_timeout_edit_params +from ....types.zones.settings.proxy_read_timeout import ProxyReadTimeout +from ....types.zones.settings.proxy_read_timeout_param import ProxyReadTimeoutParam __all__ = ["ProxyReadTimeoutResource", "AsyncProxyReadTimeoutResource"] diff --git a/src/cloudflare/resources/zones/settings/pseudo_ipv4.py b/src/cloudflare/resources/zones/settings/pseudo_ipv4.py index 4c3b1ae46fc..c30371d3e58 100644 --- a/src/cloudflare/resources/zones/settings/pseudo_ipv4.py +++ b/src/cloudflare/resources/zones/settings/pseudo_ipv4.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import PseudoIPV4, pseudo_ipv4_edit_params +from ....types.zones.settings import pseudo_ipv4_edit_params +from ....types.zones.settings.pseudo_ipv4 import PseudoIPV4 __all__ = ["PseudoIPV4Resource", "AsyncPseudoIPV4Resource"] diff --git a/src/cloudflare/resources/zones/settings/response_buffering.py b/src/cloudflare/resources/zones/settings/response_buffering.py index 1924d7d7826..d00093ba87a 100644 --- a/src/cloudflare/resources/zones/settings/response_buffering.py +++ b/src/cloudflare/resources/zones/settings/response_buffering.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import ResponseBuffering, response_buffering_edit_params +from ....types.zones.settings import response_buffering_edit_params +from ....types.zones.settings.response_buffering import ResponseBuffering __all__ = ["ResponseBufferingResource", "AsyncResponseBufferingResource"] diff --git a/src/cloudflare/resources/zones/settings/rocket_loader.py b/src/cloudflare/resources/zones/settings/rocket_loader.py index 33f7a4002c3..0fbe364370d 100644 --- a/src/cloudflare/resources/zones/settings/rocket_loader.py +++ b/src/cloudflare/resources/zones/settings/rocket_loader.py @@ -23,7 +23,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import RocketLoader, RocketLoaderParam, rocket_loader_edit_params +from ....types.zones.settings import RocketLoader, rocket_loader_edit_params +from ....types.zones.settings.rocket_loader import RocketLoader +from ....types.zones.settings.rocket_loader_param import RocketLoaderParam __all__ = ["RocketLoaderResource", "AsyncRocketLoaderResource"] diff --git a/src/cloudflare/resources/zones/settings/security_level.py b/src/cloudflare/resources/zones/settings/security_level.py index 3cf0e59c79a..af9040125a5 100644 --- a/src/cloudflare/resources/zones/settings/security_level.py +++ b/src/cloudflare/resources/zones/settings/security_level.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import SecurityLevel, security_level_edit_params +from ....types.zones.settings import security_level_edit_params +from ....types.zones.settings.security_level import SecurityLevel __all__ = ["SecurityLevelResource", "AsyncSecurityLevelResource"] diff --git a/src/cloudflare/resources/zones/settings/sort_query_string_for_cache.py b/src/cloudflare/resources/zones/settings/sort_query_string_for_cache.py index c0f536a2a78..8ac6a3306fa 100644 --- a/src/cloudflare/resources/zones/settings/sort_query_string_for_cache.py +++ b/src/cloudflare/resources/zones/settings/sort_query_string_for_cache.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import SortQueryStringForCache, sort_query_string_for_cache_edit_params +from ....types.zones.settings import sort_query_string_for_cache_edit_params +from ....types.zones.settings.sort_query_string_for_cache import SortQueryStringForCache __all__ = ["SortQueryStringForCacheResource", "AsyncSortQueryStringForCacheResource"] diff --git a/src/cloudflare/resources/zones/settings/ssl.py b/src/cloudflare/resources/zones/settings/ssl.py index 9915e3922d3..c04dd0ce79a 100644 --- a/src/cloudflare/resources/zones/settings/ssl.py +++ b/src/cloudflare/resources/zones/settings/ssl.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import SSL, ssl_edit_params +from ....types.zones.settings import ssl_edit_params +from ....types.zones.settings.ssl import SSL __all__ = ["SSLResource", "AsyncSSLResource"] diff --git a/src/cloudflare/resources/zones/settings/ssl_recommender.py b/src/cloudflare/resources/zones/settings/ssl_recommender.py index 95d4775eb75..816dd22ade6 100644 --- a/src/cloudflare/resources/zones/settings/ssl_recommender.py +++ b/src/cloudflare/resources/zones/settings/ssl_recommender.py @@ -23,7 +23,9 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import SSLRecommender, SSLRecommenderParam, ssl_recommender_edit_params +from ....types.zones.settings import SSLRecommender, ssl_recommender_edit_params +from ....types.zones.settings.ssl_recommender import SSLRecommender +from ....types.zones.settings.ssl_recommender_param import SSLRecommenderParam __all__ = ["SSLRecommenderResource", "AsyncSSLRecommenderResource"] diff --git a/src/cloudflare/resources/zones/settings/tls_1_3.py b/src/cloudflare/resources/zones/settings/tls_1_3.py index ab276bea62e..77eb21c1c48 100644 --- a/src/cloudflare/resources/zones/settings/tls_1_3.py +++ b/src/cloudflare/resources/zones/settings/tls_1_3.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import TLS1_3, tls_1_3_edit_params +from ....types.zones.settings import tls_1_3_edit_params +from ....types.zones.settings.tls_1_3 import TLS1_3 __all__ = ["TLS1_3Resource", "AsyncTLS1_3Resource"] diff --git a/src/cloudflare/resources/zones/settings/tls_client_auth.py b/src/cloudflare/resources/zones/settings/tls_client_auth.py index d2f8ea087b2..f1f2646104e 100644 --- a/src/cloudflare/resources/zones/settings/tls_client_auth.py +++ b/src/cloudflare/resources/zones/settings/tls_client_auth.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import TLSClientAuth, tls_client_auth_edit_params +from ....types.zones.settings import tls_client_auth_edit_params +from ....types.zones.settings.tls_client_auth import TLSClientAuth __all__ = ["TLSClientAuthResource", "AsyncTLSClientAuthResource"] diff --git a/src/cloudflare/resources/zones/settings/true_client_ip_header.py b/src/cloudflare/resources/zones/settings/true_client_ip_header.py index 4164d6573d6..ebe9635793b 100644 --- a/src/cloudflare/resources/zones/settings/true_client_ip_header.py +++ b/src/cloudflare/resources/zones/settings/true_client_ip_header.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import TrueClientIPHeader, true_client_ip_header_edit_params +from ....types.zones.settings import true_client_ip_header_edit_params +from ....types.zones.settings.true_client_ip_header import TrueClientIPHeader __all__ = ["TrueClientIPHeaderResource", "AsyncTrueClientIPHeaderResource"] diff --git a/src/cloudflare/resources/zones/settings/waf.py b/src/cloudflare/resources/zones/settings/waf.py index 78c09b4bd1a..42ce04861e0 100644 --- a/src/cloudflare/resources/zones/settings/waf.py +++ b/src/cloudflare/resources/zones/settings/waf.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import WAF, waf_edit_params +from ....types.zones.settings import waf_edit_params +from ....types.zones.settings.waf import WAF __all__ = ["WAFResource", "AsyncWAFResource"] diff --git a/src/cloudflare/resources/zones/settings/webp.py b/src/cloudflare/resources/zones/settings/webp.py index ec9d129a19c..e6fc0ac0ab4 100644 --- a/src/cloudflare/resources/zones/settings/webp.py +++ b/src/cloudflare/resources/zones/settings/webp.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import WebP, webp_edit_params +from ....types.zones.settings import webp_edit_params +from ....types.zones.settings.webp import WebP __all__ = ["WebPResource", "AsyncWebPResource"] diff --git a/src/cloudflare/resources/zones/settings/websocket.py b/src/cloudflare/resources/zones/settings/websocket.py index 37d683135d9..9caba287e7d 100644 --- a/src/cloudflare/resources/zones/settings/websocket.py +++ b/src/cloudflare/resources/zones/settings/websocket.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import Websocket, websocket_edit_params +from ....types.zones.settings import websocket_edit_params +from ....types.zones.settings.websocket import Websocket __all__ = ["WebsocketResource", "AsyncWebsocketResource"] diff --git a/src/cloudflare/resources/zones/settings/zero_rtt.py b/src/cloudflare/resources/zones/settings/zero_rtt.py index 64ed78cf4d7..fafd4dea55d 100644 --- a/src/cloudflare/resources/zones/settings/zero_rtt.py +++ b/src/cloudflare/resources/zones/settings/zero_rtt.py @@ -24,7 +24,8 @@ from ...._base_client import ( make_request_options, ) -from ....types.zones.settings import ZeroRTT, zero_rtt_edit_params +from ....types.zones.settings import zero_rtt_edit_params +from ....types.zones.settings.zero_rtt import ZeroRTT __all__ = ["ZeroRTTResource", "AsyncZeroRTTResource"] diff --git a/src/cloudflare/resources/zones/subscriptions.py b/src/cloudflare/resources/zones/subscriptions.py index c64adc5a0f5..15a00d2aaef 100644 --- a/src/cloudflare/resources/zones/subscriptions.py +++ b/src/cloudflare/resources/zones/subscriptions.py @@ -22,17 +22,17 @@ ) from ..._wrappers import ResultWrapper from ...pagination import SyncSinglePage, AsyncSinglePage -from ...types.user import ( - Subscription, - RatePlanParam, - SubscriptionZoneParam, - SubscriptionComponentParam, -) -from ...types.zones import SubscriptionGetResponse, SubscriptionCreateResponse, subscription_create_params +from ...types.zones import subscription_create_params from ..._base_client import ( AsyncPaginator, make_request_options, ) +from ...types.user.subscription import Subscription +from ...types.user.rate_plan_param import RatePlanParam +from ...types.user.subscription_zone_param import SubscriptionZoneParam +from ...types.zones.subscription_get_response import SubscriptionGetResponse +from ...types.user.subscription_component_param import SubscriptionComponentParam +from ...types.zones.subscription_create_response import SubscriptionCreateResponse __all__ = ["Subscriptions", "AsyncSubscriptions"] diff --git a/src/cloudflare/resources/zones/zones.py b/src/cloudflare/resources/zones/zones.py index f3de5cfd66e..9b0ea116db7 100644 --- a/src/cloudflare/resources/zones/zones.py +++ b/src/cloudflare/resources/zones/zones.py @@ -46,7 +46,7 @@ DNSSettingsWithStreamingResponse, AsyncDNSSettingsWithStreamingResponse, ) -from ...types.zones import Zone, ZoneDeleteResponse, zone_edit_params, zone_list_params, zone_create_params +from ...types.zones import zone_edit_params, zone_list_params, zone_create_params from .subscriptions import ( Subscriptions, AsyncSubscriptions, @@ -68,6 +68,7 @@ AsyncActivationCheckWithStreamingResponse, ) from .settings.settings import Settings, AsyncSettings +from ...types.zones.zone import Zone from .custom_nameservers import ( CustomNameservers, AsyncCustomNameservers, @@ -76,6 +77,7 @@ CustomNameserversWithStreamingResponse, AsyncCustomNameserversWithStreamingResponse, ) +from ...types.zones.zone_delete_response import ZoneDeleteResponse __all__ = ["Zones", "AsyncZones"] diff --git a/src/cloudflare/types/accounts/member_list_response.py b/src/cloudflare/types/accounts/member_list_response.py index 76e07eb38b3..ca5c995cf44 100644 --- a/src/cloudflare/types/accounts/member_list_response.py +++ b/src/cloudflare/types/accounts/member_list_response.py @@ -3,8 +3,8 @@ from typing import List, Optional from typing_extensions import Literal -from ..shared import Role from ..._models import BaseModel +from ..shared.role import Role __all__ = ["MemberListResponse"] diff --git a/src/cloudflare/types/accounts/user_with_invite_code.py b/src/cloudflare/types/accounts/user_with_invite_code.py index dafaafc28bb..ab928845355 100644 --- a/src/cloudflare/types/accounts/user_with_invite_code.py +++ b/src/cloudflare/types/accounts/user_with_invite_code.py @@ -2,8 +2,8 @@ from typing import List, Optional -from ..shared import PermissionGrant from ..._models import BaseModel +from ..shared.permission_grant import PermissionGrant __all__ = ["UserWithInviteCode", "Role", "RolePermissions", "User"] diff --git a/src/cloudflare/types/addressing/prefixes/bgp/binding_delete_response.py b/src/cloudflare/types/addressing/prefixes/bgp/binding_delete_response.py index e893f88f10c..9746074b34a 100644 --- a/src/cloudflare/types/addressing/prefixes/bgp/binding_delete_response.py +++ b/src/cloudflare/types/addressing/prefixes/bgp/binding_delete_response.py @@ -3,8 +3,8 @@ from typing import List from typing_extensions import Literal -from ....shared import ResponseInfo from ....._models import BaseModel +from ....shared.response_info import ResponseInfo __all__ = ["BindingDeleteResponse"] diff --git a/src/cloudflare/types/custom_certificates/custom_certificate.py b/src/cloudflare/types/custom_certificates/custom_certificate.py index 57aed85168c..b5579f8a95f 100644 --- a/src/cloudflare/types/custom_certificates/custom_certificate.py +++ b/src/cloudflare/types/custom_certificates/custom_certificate.py @@ -6,8 +6,8 @@ from ..._models import BaseModel from .geo_restrictions import GeoRestrictions -from ..custom_hostnames import BundleMethod -from ..keyless_certificates import KeylessCertificate +from ..custom_hostnames.bundle_method import BundleMethod +from ..keyless_certificates.keyless_certificate import KeylessCertificate __all__ = ["CustomCertificate"] diff --git a/src/cloudflare/types/custom_certificates/custom_certificate_create_params.py b/src/cloudflare/types/custom_certificates/custom_certificate_create_params.py index 00957f0d660..015cc848ee0 100644 --- a/src/cloudflare/types/custom_certificates/custom_certificate_create_params.py +++ b/src/cloudflare/types/custom_certificates/custom_certificate_create_params.py @@ -4,8 +4,8 @@ from typing_extensions import Literal, Required, TypedDict -from ..custom_hostnames import BundleMethod from .geo_restrictions_param import GeoRestrictionsParam +from ..custom_hostnames.bundle_method import BundleMethod __all__ = ["CustomCertificateCreateParams"] diff --git a/src/cloudflare/types/custom_certificates/custom_certificate_edit_params.py b/src/cloudflare/types/custom_certificates/custom_certificate_edit_params.py index 82ce5454c7f..3fc3b9281b0 100644 --- a/src/cloudflare/types/custom_certificates/custom_certificate_edit_params.py +++ b/src/cloudflare/types/custom_certificates/custom_certificate_edit_params.py @@ -4,8 +4,8 @@ from typing_extensions import Required, TypedDict -from ..custom_hostnames import BundleMethod from .geo_restrictions_param import GeoRestrictionsParam +from ..custom_hostnames.bundle_method import BundleMethod __all__ = ["CustomCertificateEditParams"] diff --git a/src/cloudflare/types/firewall/firewall_rule.py b/src/cloudflare/types/firewall/firewall_rule.py index 6e5b521c5d2..8c3a20fffad 100644 --- a/src/cloudflare/types/firewall/firewall_rule.py +++ b/src/cloudflare/types/firewall/firewall_rule.py @@ -2,11 +2,11 @@ from typing import List, Union, Optional -from ..filters import FirewallFilter from .products import Products from ..._models import BaseModel -from ..rate_limits import Action from .deleted_filter import DeletedFilter +from ..rate_limits.action import Action +from ..filters.firewall_filter import FirewallFilter __all__ = ["FirewallRule", "Filter"] diff --git a/src/cloudflare/types/firewall/waf/package_get_response.py b/src/cloudflare/types/firewall/waf/package_get_response.py index 7441ec80961..989c04aa3a5 100644 --- a/src/cloudflare/types/firewall/waf/package_get_response.py +++ b/src/cloudflare/types/firewall/waf/package_get_response.py @@ -3,8 +3,8 @@ from typing import List, Union, Optional from typing_extensions import Literal -from ...shared import ResponseInfo from ...._models import BaseModel +from ...shared.response_info import ResponseInfo __all__ = ["PackageGetResponse", "FirewallAPIResponseSingle", "Result"] diff --git a/src/cloudflare/types/firewall/waf/package_list_response.py b/src/cloudflare/types/firewall/waf/package_list_response.py index c121f7e5f6c..f42e59fd524 100644 --- a/src/cloudflare/types/firewall/waf/package_list_response.py +++ b/src/cloudflare/types/firewall/waf/package_list_response.py @@ -3,8 +3,8 @@ from typing import List, Union, Optional from typing_extensions import Literal -from ...shared import ResponseInfo from ...._models import BaseModel +from ...shared.response_info import ResponseInfo __all__ = [ "PackageListResponse", diff --git a/src/cloudflare/types/images/v1_list_response.py b/src/cloudflare/types/images/v1_list_response.py index 20552ea88e7..44974f29c14 100644 --- a/src/cloudflare/types/images/v1_list_response.py +++ b/src/cloudflare/types/images/v1_list_response.py @@ -4,8 +4,8 @@ from typing_extensions import Literal from .image import Image -from ..shared import ResponseInfo from ..._models import BaseModel +from ..shared.response_info import ResponseInfo __all__ = ["V1ListResponse", "Result"] diff --git a/src/cloudflare/types/intel/asn/subnet_get_response.py b/src/cloudflare/types/intel/asn/subnet_get_response.py index 5a74b47cb11..fc4c5d0cc30 100644 --- a/src/cloudflare/types/intel/asn/subnet_get_response.py +++ b/src/cloudflare/types/intel/asn/subnet_get_response.py @@ -2,8 +2,8 @@ from typing import List, Optional -from ...shared import ASN from ...._models import BaseModel +from ...shared.asn import ASN __all__ = ["SubnetGetResponse"] diff --git a/src/cloudflare/types/intel/attack_surface_report/issue_list_response.py b/src/cloudflare/types/intel/attack_surface_report/issue_list_response.py index a61dae3081c..da16535dc2b 100644 --- a/src/cloudflare/types/intel/attack_surface_report/issue_list_response.py +++ b/src/cloudflare/types/intel/attack_surface_report/issue_list_response.py @@ -4,8 +4,8 @@ from datetime import datetime from typing_extensions import Literal -from ...shared import ResponseInfo from ...._models import BaseModel +from ...shared.response_info import ResponseInfo __all__ = ["IssueListResponse", "Result", "ResultIssue"] diff --git a/src/cloudflare/types/intel/dns_list_response.py b/src/cloudflare/types/intel/dns_list_response.py index 9f5e1bae0be..ed0cea0cfcf 100644 --- a/src/cloudflare/types/intel/dns_list_response.py +++ b/src/cloudflare/types/intel/dns_list_response.py @@ -4,8 +4,8 @@ from typing_extensions import Literal from .dns import DNS -from ..shared import ResponseInfo from ..._models import BaseModel +from ..shared.response_info import ResponseInfo __all__ = ["DNSListResponse"] diff --git a/src/cloudflare/types/keyless_certificates/keyless_certificate_create_params.py b/src/cloudflare/types/keyless_certificates/keyless_certificate_create_params.py index 86164d00907..eb5ac3a6285 100644 --- a/src/cloudflare/types/keyless_certificates/keyless_certificate_create_params.py +++ b/src/cloudflare/types/keyless_certificates/keyless_certificate_create_params.py @@ -5,7 +5,7 @@ from typing_extensions import Required, TypedDict from .tunnel_param import TunnelParam -from ..custom_hostnames import BundleMethod +from ..custom_hostnames.bundle_method import BundleMethod __all__ = ["KeylessCertificateCreateParams"] diff --git a/src/cloudflare/types/memberships/membership.py b/src/cloudflare/types/memberships/membership.py index 4b1d9003fd1..a820bdcb233 100644 --- a/src/cloudflare/types/memberships/membership.py +++ b/src/cloudflare/types/memberships/membership.py @@ -3,9 +3,9 @@ from typing import List, Optional from typing_extensions import Literal -from ..shared import PermissionGrant from ..._models import BaseModel -from ..accounts import Account +from ..accounts.account import Account +from ..shared.permission_grant import PermissionGrant __all__ = ["Membership", "Permissions"] diff --git a/src/cloudflare/types/radar/attacks/layer3/top_industry_response.py b/src/cloudflare/types/radar/attacks/layer3/top_industry_response.py index e7d27568e0b..26420c75ec6 100644 --- a/src/cloudflare/types/radar/attacks/layer3/top_industry_response.py +++ b/src/cloudflare/types/radar/attacks/layer3/top_industry_response.py @@ -5,8 +5,8 @@ from pydantic import Field as FieldInfo -from ...http import Browser from ....._models import BaseModel +from ...http.browser import Browser __all__ = ["TopIndustryResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation"] diff --git a/src/cloudflare/types/radar/attacks/layer3/top_vertical_response.py b/src/cloudflare/types/radar/attacks/layer3/top_vertical_response.py index 8cd52c15e73..5b236c7c4ae 100644 --- a/src/cloudflare/types/radar/attacks/layer3/top_vertical_response.py +++ b/src/cloudflare/types/radar/attacks/layer3/top_vertical_response.py @@ -5,8 +5,8 @@ from pydantic import Field as FieldInfo -from ...http import Browser from ....._models import BaseModel +from ...http.browser import Browser __all__ = ["TopVerticalResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation"] diff --git a/src/cloudflare/types/radar/attacks/layer7/top_industry_response.py b/src/cloudflare/types/radar/attacks/layer7/top_industry_response.py index e7d27568e0b..26420c75ec6 100644 --- a/src/cloudflare/types/radar/attacks/layer7/top_industry_response.py +++ b/src/cloudflare/types/radar/attacks/layer7/top_industry_response.py @@ -5,8 +5,8 @@ from pydantic import Field as FieldInfo -from ...http import Browser from ....._models import BaseModel +from ...http.browser import Browser __all__ = ["TopIndustryResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation"] diff --git a/src/cloudflare/types/radar/attacks/layer7/top_vertical_response.py b/src/cloudflare/types/radar/attacks/layer7/top_vertical_response.py index 8cd52c15e73..5b236c7c4ae 100644 --- a/src/cloudflare/types/radar/attacks/layer7/top_vertical_response.py +++ b/src/cloudflare/types/radar/attacks/layer7/top_vertical_response.py @@ -5,8 +5,8 @@ from pydantic import Field as FieldInfo -from ...http import Browser from ....._models import BaseModel +from ...http.browser import Browser __all__ = ["TopVerticalResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation"] diff --git a/src/cloudflare/types/radar/email/security/top/tld_get_response.py b/src/cloudflare/types/radar/email/security/top/tld_get_response.py index 60ef8acaa05..d52b588621e 100644 --- a/src/cloudflare/types/radar/email/security/top/tld_get_response.py +++ b/src/cloudflare/types/radar/email/security/top/tld_get_response.py @@ -5,8 +5,8 @@ from pydantic import Field as FieldInfo -from ....http import Browser from ......_models import BaseModel +from ....http.browser import Browser __all__ = ["TldGetResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation"] diff --git a/src/cloudflare/types/radar/email/security/top/tlds/malicious_get_response.py b/src/cloudflare/types/radar/email/security/top/tlds/malicious_get_response.py index 60f2ba0a23e..715d0bc0f9c 100644 --- a/src/cloudflare/types/radar/email/security/top/tlds/malicious_get_response.py +++ b/src/cloudflare/types/radar/email/security/top/tlds/malicious_get_response.py @@ -5,8 +5,8 @@ from pydantic import Field as FieldInfo -from .....http import Browser from ......._models import BaseModel +from .....http.browser import Browser __all__ = ["MaliciousGetResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation"] diff --git a/src/cloudflare/types/radar/email/security/top/tlds/spam_get_response.py b/src/cloudflare/types/radar/email/security/top/tlds/spam_get_response.py index 6d7d644ef82..52a8f700e53 100644 --- a/src/cloudflare/types/radar/email/security/top/tlds/spam_get_response.py +++ b/src/cloudflare/types/radar/email/security/top/tlds/spam_get_response.py @@ -5,8 +5,8 @@ from pydantic import Field as FieldInfo -from .....http import Browser from ......._models import BaseModel +from .....http.browser import Browser __all__ = ["SpamGetResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation"] diff --git a/src/cloudflare/types/radar/email/security/top/tlds/spoof_get_response.py b/src/cloudflare/types/radar/email/security/top/tlds/spoof_get_response.py index 4f2e60fef6c..5c927efe84d 100644 --- a/src/cloudflare/types/radar/email/security/top/tlds/spoof_get_response.py +++ b/src/cloudflare/types/radar/email/security/top/tlds/spoof_get_response.py @@ -5,8 +5,8 @@ from pydantic import Field as FieldInfo -from .....http import Browser from ......._models import BaseModel +from .....http.browser import Browser __all__ = ["SpoofGetResponse", "Meta", "MetaDateRange", "MetaConfidenceInfo", "MetaConfidenceInfoAnnotation"] diff --git a/src/cloudflare/types/speed/test_list_response.py b/src/cloudflare/types/speed/test_list_response.py index e97b4874d95..122df70f30f 100644 --- a/src/cloudflare/types/speed/test_list_response.py +++ b/src/cloudflare/types/speed/test_list_response.py @@ -2,8 +2,8 @@ from typing import List, Optional -from ..shared import ResponseInfo from ..._models import BaseModel +from ..shared.response_info import ResponseInfo __all__ = ["TestListResponse", "ResultInfo"] diff --git a/src/cloudflare/types/ssl/analyze_create_params.py b/src/cloudflare/types/ssl/analyze_create_params.py index 4f85cacffa1..eb06d135711 100644 --- a/src/cloudflare/types/ssl/analyze_create_params.py +++ b/src/cloudflare/types/ssl/analyze_create_params.py @@ -4,7 +4,7 @@ from typing_extensions import Required, TypedDict -from ..custom_hostnames import BundleMethod +from ..custom_hostnames.bundle_method import BundleMethod __all__ = ["AnalyzeCreateParams"] diff --git a/src/cloudflare/types/subscriptions/subscription_create_params.py b/src/cloudflare/types/subscriptions/subscription_create_params.py index 1d2b9b5dbb0..362a204da34 100644 --- a/src/cloudflare/types/subscriptions/subscription_create_params.py +++ b/src/cloudflare/types/subscriptions/subscription_create_params.py @@ -5,7 +5,9 @@ from typing import Iterable from typing_extensions import Literal, TypedDict -from ..user import RatePlanParam, SubscriptionZoneParam, SubscriptionComponentParam +from ..user.rate_plan_param import RatePlanParam +from ..user.subscription_zone_param import SubscriptionZoneParam +from ..user.subscription_component_param import SubscriptionComponentParam __all__ = ["SubscriptionCreateParams", "App"] diff --git a/src/cloudflare/types/subscriptions/subscription_update_params.py b/src/cloudflare/types/subscriptions/subscription_update_params.py index 1acb3f961e5..c68cf10cca6 100644 --- a/src/cloudflare/types/subscriptions/subscription_update_params.py +++ b/src/cloudflare/types/subscriptions/subscription_update_params.py @@ -5,7 +5,9 @@ from typing import Iterable from typing_extensions import Literal, Required, TypedDict -from ..user import RatePlanParam, SubscriptionZoneParam, SubscriptionComponentParam +from ..user.rate_plan_param import RatePlanParam +from ..user.subscription_zone_param import SubscriptionZoneParam +from ..user.subscription_component_param import SubscriptionComponentParam __all__ = ["SubscriptionUpdateParams", "App"] diff --git a/src/cloudflare/types/url_scanner/scan_get_response.py b/src/cloudflare/types/url_scanner/scan_get_response.py index 29482c354f4..dc384e7a7b8 100644 --- a/src/cloudflare/types/url_scanner/scan_get_response.py +++ b/src/cloudflare/types/url_scanner/scan_get_response.py @@ -6,8 +6,8 @@ from pydantic import Field as FieldInfo from ..._models import BaseModel -from ..radar.http import Browser from .url_scanner_domain import URLScannerDomain +from ..radar.http.browser import Browser __all__ = [ "ScanGetResponse", diff --git a/src/cloudflare/types/url_scanner/scan_har_response.py b/src/cloudflare/types/url_scanner/scan_har_response.py index d58f9ed3539..c6bae2fc9fa 100644 --- a/src/cloudflare/types/url_scanner/scan_har_response.py +++ b/src/cloudflare/types/url_scanner/scan_har_response.py @@ -5,7 +5,7 @@ from pydantic import Field as FieldInfo from ..._models import BaseModel -from ..radar.http import Browser +from ..radar.http.browser import Browser __all__ = [ "ScanHarResponse", diff --git a/src/cloudflare/types/user/invite.py b/src/cloudflare/types/user/invite.py index 94175d058b8..00c7cf5ce22 100644 --- a/src/cloudflare/types/user/invite.py +++ b/src/cloudflare/types/user/invite.py @@ -4,8 +4,8 @@ from datetime import datetime from typing_extensions import Literal -from ..shared import Role from ..._models import BaseModel +from ..shared.role import Role __all__ = ["Invite"] diff --git a/src/cloudflare/types/user/organization.py b/src/cloudflare/types/user/organization.py index 0e4881d8e7a..1db4388d7de 100644 --- a/src/cloudflare/types/user/organization.py +++ b/src/cloudflare/types/user/organization.py @@ -3,8 +3,8 @@ from typing import List, Optional from typing_extensions import Literal -from ..shared import Permission from ..._models import BaseModel +from ..shared.permission import Permission __all__ = ["Organization"] diff --git a/src/cloudflare/types/user/token_create_response.py b/src/cloudflare/types/user/token_create_response.py index 76e11c0f97f..4d68a326873 100644 --- a/src/cloudflare/types/user/token_create_response.py +++ b/src/cloudflare/types/user/token_create_response.py @@ -2,8 +2,8 @@ from typing import Optional -from .tokens import Value from ..._models import BaseModel +from .tokens.value import Value __all__ = ["TokenCreateResponse"] diff --git a/src/cloudflare/types/warp_connector/warp_connector_create_response.py b/src/cloudflare/types/warp_connector/warp_connector_create_response.py index 1346bb88f10..f76eda94d7c 100644 --- a/src/cloudflare/types/warp_connector/warp_connector_create_response.py +++ b/src/cloudflare/types/warp_connector/warp_connector_create_response.py @@ -4,8 +4,8 @@ from datetime import datetime from typing_extensions import Literal -from ..shared import CloudflareTunnel from ..._models import BaseModel +from ..shared.cloudflare_tunnel import CloudflareTunnel __all__ = ["WARPConnectorCreateResponse", "TunnelWARPConnectorTunnel", "TunnelWARPConnectorTunnelConnection"] diff --git a/src/cloudflare/types/warp_connector/warp_connector_delete_response.py b/src/cloudflare/types/warp_connector/warp_connector_delete_response.py index 57d62b9a4bc..22c9fd73ca3 100644 --- a/src/cloudflare/types/warp_connector/warp_connector_delete_response.py +++ b/src/cloudflare/types/warp_connector/warp_connector_delete_response.py @@ -4,8 +4,8 @@ from datetime import datetime from typing_extensions import Literal -from ..shared import CloudflareTunnel from ..._models import BaseModel +from ..shared.cloudflare_tunnel import CloudflareTunnel __all__ = ["WARPConnectorDeleteResponse", "TunnelWARPConnectorTunnel", "TunnelWARPConnectorTunnelConnection"] diff --git a/src/cloudflare/types/warp_connector/warp_connector_edit_response.py b/src/cloudflare/types/warp_connector/warp_connector_edit_response.py index 8b8564a0c94..19ac4305497 100644 --- a/src/cloudflare/types/warp_connector/warp_connector_edit_response.py +++ b/src/cloudflare/types/warp_connector/warp_connector_edit_response.py @@ -4,8 +4,8 @@ from datetime import datetime from typing_extensions import Literal -from ..shared import CloudflareTunnel from ..._models import BaseModel +from ..shared.cloudflare_tunnel import CloudflareTunnel __all__ = ["WARPConnectorEditResponse", "TunnelWARPConnectorTunnel", "TunnelWARPConnectorTunnelConnection"] diff --git a/src/cloudflare/types/warp_connector/warp_connector_get_response.py b/src/cloudflare/types/warp_connector/warp_connector_get_response.py index 7db3c258a29..aab7e8cfb2c 100644 --- a/src/cloudflare/types/warp_connector/warp_connector_get_response.py +++ b/src/cloudflare/types/warp_connector/warp_connector_get_response.py @@ -4,8 +4,8 @@ from datetime import datetime from typing_extensions import Literal -from ..shared import CloudflareTunnel from ..._models import BaseModel +from ..shared.cloudflare_tunnel import CloudflareTunnel __all__ = ["WARPConnectorGetResponse", "TunnelWARPConnectorTunnel", "TunnelWARPConnectorTunnelConnection"] diff --git a/src/cloudflare/types/warp_connector/warp_connector_list_response.py b/src/cloudflare/types/warp_connector/warp_connector_list_response.py index 78635affe5e..a5b67df48c4 100644 --- a/src/cloudflare/types/warp_connector/warp_connector_list_response.py +++ b/src/cloudflare/types/warp_connector/warp_connector_list_response.py @@ -4,8 +4,8 @@ from datetime import datetime from typing_extensions import Literal -from ..shared import CloudflareTunnel from ..._models import BaseModel +from ..shared.cloudflare_tunnel import CloudflareTunnel __all__ = ["WARPConnectorListResponse", "TunnelWARPConnectorTunnel", "TunnelWARPConnectorTunnelConnection"] diff --git a/src/cloudflare/types/workers/script.py b/src/cloudflare/types/workers/script.py index 99c72f91c25..233187b23ec 100644 --- a/src/cloudflare/types/workers/script.py +++ b/src/cloudflare/types/workers/script.py @@ -3,8 +3,8 @@ from typing import List, Optional from datetime import datetime -from .scripts import ConsumerScript from ..._models import BaseModel +from .scripts.consumer_script import ConsumerScript __all__ = ["Script"] diff --git a/src/cloudflare/types/workers/script_setting.py b/src/cloudflare/types/workers/script_setting.py index 164cb6bc1ba..9b0b43d6364 100644 --- a/src/cloudflare/types/workers/script_setting.py +++ b/src/cloudflare/types/workers/script_setting.py @@ -2,8 +2,8 @@ from typing import List, Optional -from .scripts import ConsumerScript from ..._models import BaseModel +from .scripts.consumer_script import ConsumerScript __all__ = ["ScriptSetting"] diff --git a/src/cloudflare/types/workers/script_update_params.py b/src/cloudflare/types/workers/script_update_params.py index c919af30fc3..5f85fd04e21 100644 --- a/src/cloudflare/types/workers/script_update_params.py +++ b/src/cloudflare/types/workers/script_update_params.py @@ -5,12 +5,12 @@ from typing import List, Union, Iterable from typing_extensions import Literal, Required, Annotated, TypedDict -from .scripts import ConsumerScriptParam from ..._types import FileTypes from ..._utils import PropertyInfo from .stepped_migration_param import SteppedMigrationParam from .single_step_migration_param import SingleStepMigrationParam from .placement_configuration_param import PlacementConfigurationParam +from .scripts.consumer_script_param import ConsumerScriptParam __all__ = ["ScriptUpdateParams", "Variant0", "Variant0Metadata", "Variant0MetadataMigrations", "Variant1"] diff --git a/src/cloudflare/types/workers/scripts/tail_delete_response.py b/src/cloudflare/types/workers/scripts/tail_delete_response.py index 63b7e710c39..a1947aaa697 100644 --- a/src/cloudflare/types/workers/scripts/tail_delete_response.py +++ b/src/cloudflare/types/workers/scripts/tail_delete_response.py @@ -3,8 +3,8 @@ from typing import List from typing_extensions import Literal -from ...shared import ResponseInfo from ...._models import BaseModel +from ...shared.response_info import ResponseInfo __all__ = ["TailDeleteResponse"] diff --git a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/script_update_params.py b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/script_update_params.py index 0556bc03e02..53bb144df7d 100644 --- a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/script_update_params.py +++ b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/script_update_params.py @@ -7,8 +7,10 @@ from ....._types import FileTypes from ....._utils import PropertyInfo -from ....workers import SteppedMigrationParam, SingleStepMigrationParam, PlacementConfigurationParam -from ....workers.scripts import ConsumerScriptParam +from ....workers.stepped_migration_param import SteppedMigrationParam +from ....workers.single_step_migration_param import SingleStepMigrationParam +from ....workers.placement_configuration_param import PlacementConfigurationParam +from ....workers.scripts.consumer_script_param import ConsumerScriptParam __all__ = ["ScriptUpdateParams", "Variant0", "Variant0Metadata", "Variant0MetadataMigrations", "Variant1"] diff --git a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/binding_get_response.py b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/binding_get_response.py index f228333a623..9d8efdf1f7b 100644 --- a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/binding_get_response.py +++ b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/binding_get_response.py @@ -2,7 +2,7 @@ from typing import List -from .....workers import Binding +from .....workers.binding import Binding __all__ = ["BindingGetResponse"] diff --git a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/content_update_params.py b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/content_update_params.py index f3b9d5cb1dc..a9f9eceeb85 100644 --- a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/content_update_params.py +++ b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/content_update_params.py @@ -7,7 +7,7 @@ from ......_types import FileTypes from ......_utils import PropertyInfo -from .....workers import WorkerMetadataParam +from .....workers.worker_metadata_param import WorkerMetadataParam __all__ = ["ContentUpdateParams"] diff --git a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/setting_edit_params.py b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/setting_edit_params.py index a51e4e5a291..1d4c53175c3 100644 --- a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/setting_edit_params.py +++ b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/setting_edit_params.py @@ -5,8 +5,11 @@ from typing import List, Union, Iterable from typing_extensions import Required, TypedDict -from .....workers import BindingParam, SteppedMigrationParam, SingleStepMigrationParam, PlacementConfigurationParam -from .....workers.scripts import ConsumerScriptParam +from .....workers.binding_param import BindingParam +from .....workers.stepped_migration_param import SteppedMigrationParam +from .....workers.single_step_migration_param import SingleStepMigrationParam +from .....workers.placement_configuration_param import PlacementConfigurationParam +from .....workers.scripts.consumer_script_param import ConsumerScriptParam __all__ = ["SettingEditParams", "Settings", "SettingsLimits", "SettingsMigrations"] diff --git a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/setting_edit_response.py b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/setting_edit_response.py index 57b7b07cee8..e25777737a2 100644 --- a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/setting_edit_response.py +++ b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/setting_edit_response.py @@ -2,9 +2,12 @@ from typing import List, Union, Optional -from .....workers import Binding, SteppedMigration, SingleStepMigration, PlacementConfiguration from ......_models import BaseModel -from .....workers.scripts import ConsumerScript +from .....workers.binding import Binding +from .....workers.stepped_migration import SteppedMigration +from .....workers.single_step_migration import SingleStepMigration +from .....workers.placement_configuration import PlacementConfiguration +from .....workers.scripts.consumer_script import ConsumerScript __all__ = ["SettingEditResponse", "Limits", "Migrations"] diff --git a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/setting_get_response.py b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/setting_get_response.py index f5892a091d4..da7cf1eb242 100644 --- a/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/setting_get_response.py +++ b/src/cloudflare/types/workers_for_platforms/dispatch/namespaces/scripts/setting_get_response.py @@ -2,9 +2,12 @@ from typing import List, Union, Optional -from .....workers import Binding, SteppedMigration, SingleStepMigration, PlacementConfiguration from ......_models import BaseModel -from .....workers.scripts import ConsumerScript +from .....workers.binding import Binding +from .....workers.stepped_migration import SteppedMigration +from .....workers.single_step_migration import SingleStepMigration +from .....workers.placement_configuration import PlacementConfiguration +from .....workers.scripts.consumer_script import ConsumerScript __all__ = ["SettingGetResponse", "Limits", "Migrations"] diff --git a/src/cloudflare/types/zero_trust/access/users/active_session_get_response.py b/src/cloudflare/types/zero_trust/access/users/active_session_get_response.py index 7ffd70d9b5e..2414f09a55c 100644 --- a/src/cloudflare/types/zero_trust/access/users/active_session_get_response.py +++ b/src/cloudflare/types/zero_trust/access/users/active_session_get_response.py @@ -5,7 +5,7 @@ from pydantic import Field as FieldInfo from ....._models import BaseModel -from ..applications import UserPolicyCheckGeo +from ..applications.user_policy_check_geo import UserPolicyCheckGeo __all__ = ["ActiveSessionGetResponse", "DeviceSessions", "DevicePosture", "DevicePostureCheck", "IdP", "MTLSAuth"] diff --git a/src/cloudflare/types/zero_trust/access/users/identity.py b/src/cloudflare/types/zero_trust/access/users/identity.py index 4061c09a258..52f27fee6c2 100644 --- a/src/cloudflare/types/zero_trust/access/users/identity.py +++ b/src/cloudflare/types/zero_trust/access/users/identity.py @@ -5,7 +5,7 @@ from pydantic import Field as FieldInfo from ....._models import BaseModel -from ..applications import UserPolicyCheckGeo +from ..applications.user_policy_check_geo import UserPolicyCheckGeo __all__ = ["Identity", "DeviceSessions", "DevicePosture", "DevicePostureCheck", "IdP", "MTLSAuth"] diff --git a/src/cloudflare/types/zero_trust/devices/settings_policy.py b/src/cloudflare/types/zero_trust/devices/settings_policy.py index a98d84648f5..a670a4c8927 100644 --- a/src/cloudflare/types/zero_trust/devices/settings_policy.py +++ b/src/cloudflare/types/zero_trust/devices/settings_policy.py @@ -2,8 +2,10 @@ from typing import List, Optional -from .policies import FallbackDomain, SplitTunnelExclude, SplitTunnelInclude from ...._models import BaseModel +from .policies.fallback_domain import FallbackDomain +from .policies.split_tunnel_exclude import SplitTunnelExclude +from .policies.split_tunnel_include import SplitTunnelInclude __all__ = ["SettingsPolicy", "ServiceModeV2", "TargetTest"] diff --git a/src/cloudflare/types/zero_trust/dex/http_details.py b/src/cloudflare/types/zero_trust/dex/http_details.py index 2d447557992..a8f9463ddf0 100644 --- a/src/cloudflare/types/zero_trust/dex/http_details.py +++ b/src/cloudflare/types/zero_trust/dex/http_details.py @@ -6,8 +6,8 @@ from pydantic import Field as FieldInfo from ...._models import BaseModel -from .http_tests import TestStatOverTime from ..device_experience_monitor import DeviceExperienceMonitor +from .http_tests.test_stat_over_time import TestStatOverTime __all__ = [ "HTTPDetails", diff --git a/src/cloudflare/types/zero_trust/dex/test_list_response.py b/src/cloudflare/types/zero_trust/dex/test_list_response.py index aec336013c2..140ad36e45d 100644 --- a/src/cloudflare/types/zero_trust/dex/test_list_response.py +++ b/src/cloudflare/types/zero_trust/dex/test_list_response.py @@ -3,9 +3,9 @@ from typing import List, Optional from typing_extensions import Literal -from .tests import Tests -from ...shared import ResponseInfo from ...._models import BaseModel +from .tests.tests import Tests +from ...shared.response_info import ResponseInfo __all__ = ["TestListResponse", "ResultInfo"] diff --git a/src/cloudflare/types/zero_trust/dex/traceroute.py b/src/cloudflare/types/zero_trust/dex/traceroute.py index ea500057fa5..3faa4dbcb9b 100644 --- a/src/cloudflare/types/zero_trust/dex/traceroute.py +++ b/src/cloudflare/types/zero_trust/dex/traceroute.py @@ -6,8 +6,8 @@ from pydantic import Field as FieldInfo from ...._models import BaseModel -from .http_tests import TestStatOverTime from ..device_experience_monitor import DeviceExperienceMonitor +from .http_tests.test_stat_over_time import TestStatOverTime __all__ = [ "Traceroute", diff --git a/src/cloudflare/types/zero_trust/dlp/profile.py b/src/cloudflare/types/zero_trust/dlp/profile.py index fba9a61e7d2..ecc092685a0 100644 --- a/src/cloudflare/types/zero_trust/dlp/profile.py +++ b/src/cloudflare/types/zero_trust/dlp/profile.py @@ -4,8 +4,9 @@ from datetime import datetime from typing_extensions import Literal -from .profiles import CustomProfile, PredefinedProfile from ...._models import BaseModel +from .profiles.custom_profile import CustomProfile +from .profiles.predefined_profile import PredefinedProfile __all__ = ["Profile", "DLPIntegrationProfile", "DLPIntegrationProfileEntry"] diff --git a/src/cloudflare/types/zero_trust/dlp/profile_get_response.py b/src/cloudflare/types/zero_trust/dlp/profile_get_response.py index c14614dd62f..c8e1a4e93ed 100644 --- a/src/cloudflare/types/zero_trust/dlp/profile_get_response.py +++ b/src/cloudflare/types/zero_trust/dlp/profile_get_response.py @@ -4,8 +4,9 @@ from datetime import datetime from typing_extensions import Literal -from .profiles import CustomProfile, PredefinedProfile from ...._models import BaseModel +from .profiles.custom_profile import CustomProfile +from .profiles.predefined_profile import PredefinedProfile __all__ = ["ProfileGetResponse", "DLPIntegrationProfile", "DLPIntegrationProfileEntry"] diff --git a/src/cloudflare/types/zero_trust/tunnel_edit_response.py b/src/cloudflare/types/zero_trust/tunnel_edit_response.py index e81f229fd37..b1871e21042 100644 --- a/src/cloudflare/types/zero_trust/tunnel_edit_response.py +++ b/src/cloudflare/types/zero_trust/tunnel_edit_response.py @@ -4,8 +4,8 @@ from datetime import datetime from typing_extensions import Literal -from ..shared import CloudflareTunnel from ..._models import BaseModel +from ..shared.cloudflare_tunnel import CloudflareTunnel __all__ = ["TunnelEditResponse", "TunnelWARPConnectorTunnel", "TunnelWARPConnectorTunnelConnection"] diff --git a/src/cloudflare/types/zero_trust/tunnel_list_response.py b/src/cloudflare/types/zero_trust/tunnel_list_response.py index 7329efadedc..ab94c69f9b7 100644 --- a/src/cloudflare/types/zero_trust/tunnel_list_response.py +++ b/src/cloudflare/types/zero_trust/tunnel_list_response.py @@ -4,8 +4,8 @@ from datetime import datetime from typing_extensions import Literal -from ..shared import CloudflareTunnel from ..._models import BaseModel +from ..shared.cloudflare_tunnel import CloudflareTunnel __all__ = ["TunnelListResponse", "TunnelWARPConnectorTunnel", "TunnelWARPConnectorTunnelConnection"] diff --git a/src/cloudflare/types/zones/subscription_create_params.py b/src/cloudflare/types/zones/subscription_create_params.py index 1d2b9b5dbb0..362a204da34 100644 --- a/src/cloudflare/types/zones/subscription_create_params.py +++ b/src/cloudflare/types/zones/subscription_create_params.py @@ -5,7 +5,9 @@ from typing import Iterable from typing_extensions import Literal, TypedDict -from ..user import RatePlanParam, SubscriptionZoneParam, SubscriptionComponentParam +from ..user.rate_plan_param import RatePlanParam +from ..user.subscription_zone_param import SubscriptionZoneParam +from ..user.subscription_component_param import SubscriptionComponentParam __all__ = ["SubscriptionCreateParams", "App"] diff --git a/tests/api_resources/accounts/test_members.py b/tests/api_resources/accounts/test_members.py index c687d0cb4e1..9aa9ad36804 100644 --- a/tests/api_resources/accounts/test_members.py +++ b/tests/api_resources/accounts/test_members.py @@ -10,12 +10,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.shared import Member -from cloudflare.types.accounts import ( - MemberListResponse, - UserWithInviteCode, - MemberDeleteResponse, -) +from cloudflare.types.shared.member import Member +from cloudflare.types.accounts.member_list_response import MemberListResponse +from cloudflare.types.accounts.user_with_invite_code import UserWithInviteCode +from cloudflare.types.accounts.member_delete_response import MemberDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/accounts/test_roles.py b/tests/api_resources/accounts/test_roles.py index 1410249e0d4..0012acf6de2 100644 --- a/tests/api_resources/accounts/test_roles.py +++ b/tests/api_resources/accounts/test_roles.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 Role -from cloudflare.types.accounts import RoleGetResponse +from cloudflare.types.shared.role import Role +from cloudflare.types.accounts.role_get_response import RoleGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/acm/test_total_tls.py b/tests/api_resources/acm/test_total_tls.py index 1f0db8a87a6..252f2eeaeaf 100644 --- a/tests/api_resources/acm/test_total_tls.py +++ b/tests/api_resources/acm/test_total_tls.py @@ -9,7 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.acm import TotalTLSGetResponse, TotalTLSCreateResponse +from cloudflare.types.acm.total_tls_get_response import TotalTLSGetResponse +from cloudflare.types.acm.total_tls_create_response import TotalTLSCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/addressing/address_maps/test_accounts.py b/tests/api_resources/addressing/address_maps/test_accounts.py index 873237569e9..78926097266 100644 --- a/tests/api_resources/addressing/address_maps/test_accounts.py +++ b/tests/api_resources/addressing/address_maps/test_accounts.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.addressing.address_maps import ( - AccountDeleteResponse, - AccountUpdateResponse, -) +from cloudflare.types.addressing.address_maps.account_delete_response import AccountDeleteResponse +from cloudflare.types.addressing.address_maps.account_update_response import AccountUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/addressing/address_maps/test_ips.py b/tests/api_resources/addressing/address_maps/test_ips.py index 5ac092eb762..f7d5578d9b9 100644 --- a/tests/api_resources/addressing/address_maps/test_ips.py +++ b/tests/api_resources/addressing/address_maps/test_ips.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.addressing.address_maps import ( - IPDeleteResponse, - IPUpdateResponse, -) +from cloudflare.types.addressing.address_maps.ip_delete_response import IPDeleteResponse +from cloudflare.types.addressing.address_maps.ip_update_response import IPUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/addressing/address_maps/test_zones.py b/tests/api_resources/addressing/address_maps/test_zones.py index 450019f8c44..0d555264b02 100644 --- a/tests/api_resources/addressing/address_maps/test_zones.py +++ b/tests/api_resources/addressing/address_maps/test_zones.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.addressing.address_maps import ( - ZoneDeleteResponse, - ZoneUpdateResponse, -) +from cloudflare.types.addressing.address_maps.zone_delete_response import ZoneDeleteResponse +from cloudflare.types.addressing.address_maps.zone_update_response import ZoneUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/addressing/prefixes/bgp/test_bindings.py b/tests/api_resources/addressing/prefixes/bgp/test_bindings.py index 857b59c2c6b..3d1dc415316 100644 --- a/tests/api_resources/addressing/prefixes/bgp/test_bindings.py +++ b/tests/api_resources/addressing/prefixes/bgp/test_bindings.py @@ -10,7 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.addressing.prefixes.bgp import ServiceBinding, BindingDeleteResponse +from cloudflare.types.addressing.prefixes.bgp.service_binding import ServiceBinding +from cloudflare.types.addressing.prefixes.bgp.binding_delete_response import BindingDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/addressing/prefixes/bgp/test_prefixes.py b/tests/api_resources/addressing/prefixes/bgp/test_prefixes.py index a1f54805881..ce4a9a2793e 100644 --- a/tests/api_resources/addressing/prefixes/bgp/test_prefixes.py +++ b/tests/api_resources/addressing/prefixes/bgp/test_prefixes.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.addressing.prefixes.bgp import BGPPrefix +from cloudflare.types.addressing.prefixes.bgp.bgp_prefix import BGPPrefix base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/addressing/prefixes/bgp/test_statuses.py b/tests/api_resources/addressing/prefixes/bgp/test_statuses.py index 064d464963c..c136cf59840 100644 --- a/tests/api_resources/addressing/prefixes/bgp/test_statuses.py +++ b/tests/api_resources/addressing/prefixes/bgp/test_statuses.py @@ -9,7 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.addressing.prefixes.bgp import StatusGetResponse, StatusEditResponse +from cloudflare.types.addressing.prefixes.bgp.status_get_response import StatusGetResponse +from cloudflare.types.addressing.prefixes.bgp.status_edit_response import StatusEditResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/addressing/prefixes/test_delegations.py b/tests/api_resources/addressing/prefixes/test_delegations.py index e9b5d033d66..36319156092 100644 --- a/tests/api_resources/addressing/prefixes/test_delegations.py +++ b/tests/api_resources/addressing/prefixes/test_delegations.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.addressing.prefixes import ( - Delegations, - DelegationDeleteResponse, -) +from cloudflare.types.addressing.prefixes.delegations import Delegations +from cloudflare.types.addressing.prefixes.delegation_delete_response import DelegationDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/addressing/test_address_maps.py b/tests/api_resources/addressing/test_address_maps.py index 298e15b849e..f86b0bfbdcd 100644 --- a/tests/api_resources/addressing/test_address_maps.py +++ b/tests/api_resources/addressing/test_address_maps.py @@ -10,12 +10,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.addressing import ( - AddressMap, - AddressMapGetResponse, - AddressMapCreateResponse, - AddressMapDeleteResponse, -) +from cloudflare.types.addressing.address_map import AddressMap +from cloudflare.types.addressing.address_map_get_response import AddressMapGetResponse +from cloudflare.types.addressing.address_map_create_response import AddressMapCreateResponse +from cloudflare.types.addressing.address_map_delete_response import AddressMapDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/addressing/test_loa_documents.py b/tests/api_resources/addressing/test_loa_documents.py index 7fb62037c87..e30e833227b 100644 --- a/tests/api_resources/addressing/test_loa_documents.py +++ b/tests/api_resources/addressing/test_loa_documents.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.addressing import LOADocumentCreateResponse +from cloudflare.types.addressing.loa_document_create_response import LOADocumentCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/addressing/test_prefixes.py b/tests/api_resources/addressing/test_prefixes.py index 097f86f970b..6002ebc12b1 100644 --- a/tests/api_resources/addressing/test_prefixes.py +++ b/tests/api_resources/addressing/test_prefixes.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.addressing import ( - Prefix, - PrefixDeleteResponse, -) +from cloudflare.types.addressing.prefix import Prefix +from cloudflare.types.addressing.prefix_delete_response import PrefixDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/addressing/test_services.py b/tests/api_resources/addressing/test_services.py index bab9eef74b0..76a7f62b536 100644 --- a/tests/api_resources/addressing/test_services.py +++ b/tests/api_resources/addressing/test_services.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.addressing import ServiceListResponse +from cloudflare.types.addressing.service_list_response import ServiceListResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/alerting/destinations/test_eligible.py b/tests/api_resources/alerting/destinations/test_eligible.py index ef1a207dbd4..72cd31f1b77 100644 --- a/tests/api_resources/alerting/destinations/test_eligible.py +++ b/tests/api_resources/alerting/destinations/test_eligible.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.alerting.destinations import EligibleGetResponse +from cloudflare.types.alerting.destinations.eligible_get_response import EligibleGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/alerting/destinations/test_pagerduty.py b/tests/api_resources/alerting/destinations/test_pagerduty.py index 07b1cb56436..06db14e6021 100644 --- a/tests/api_resources/alerting/destinations/test_pagerduty.py +++ b/tests/api_resources/alerting/destinations/test_pagerduty.py @@ -9,12 +9,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.alerting.destinations import ( - PagerdutyGetResponse, - PagerdutyLinkResponse, - PagerdutyCreateResponse, - PagerdutyDeleteResponse, -) +from cloudflare.types.alerting.destinations.pagerduty_get_response import PagerdutyGetResponse +from cloudflare.types.alerting.destinations.pagerduty_link_response import PagerdutyLinkResponse +from cloudflare.types.alerting.destinations.pagerduty_create_response import PagerdutyCreateResponse +from cloudflare.types.alerting.destinations.pagerduty_delete_response import PagerdutyDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/alerting/destinations/test_webhooks.py b/tests/api_resources/alerting/destinations/test_webhooks.py index fbdefa33436..98bd0ec8991 100644 --- a/tests/api_resources/alerting/destinations/test_webhooks.py +++ b/tests/api_resources/alerting/destinations/test_webhooks.py @@ -10,12 +10,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.alerting.destinations import ( - Webhooks, - WebhookCreateResponse, - WebhookDeleteResponse, - WebhookUpdateResponse, -) +from cloudflare.types.alerting.destinations.webhooks import Webhooks +from cloudflare.types.alerting.destinations.webhook_create_response import WebhookCreateResponse +from cloudflare.types.alerting.destinations.webhook_delete_response import WebhookDeleteResponse +from cloudflare.types.alerting.destinations.webhook_update_response import WebhookUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/alerting/test_available_alerts.py b/tests/api_resources/alerting/test_available_alerts.py index c3c5c6dc2fe..a788c4241c6 100644 --- a/tests/api_resources/alerting/test_available_alerts.py +++ b/tests/api_resources/alerting/test_available_alerts.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.alerting import AvailableAlertListResponse +from cloudflare.types.alerting.available_alert_list_response import AvailableAlertListResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/alerting/test_history.py b/tests/api_resources/alerting/test_history.py index 3ed58bbf83c..33daab848a8 100644 --- a/tests/api_resources/alerting/test_history.py +++ b/tests/api_resources/alerting/test_history.py @@ -11,7 +11,7 @@ from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.alerting import History +from cloudflare.types.alerting.history import History base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/alerting/test_policies.py b/tests/api_resources/alerting/test_policies.py index 0c2e2f09aec..b776db81ba2 100644 --- a/tests/api_resources/alerting/test_policies.py +++ b/tests/api_resources/alerting/test_policies.py @@ -10,12 +10,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.alerting import ( - Policy, - PolicyCreateResponse, - PolicyDeleteResponse, - PolicyUpdateResponse, -) +from cloudflare.types.alerting.policy import Policy +from cloudflare.types.alerting.policy_create_response import PolicyCreateResponse +from cloudflare.types.alerting.policy_delete_response import PolicyDeleteResponse +from cloudflare.types.alerting.policy_update_response import PolicyUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/argo/test_smart_routing.py b/tests/api_resources/argo/test_smart_routing.py index 27d13739d4c..c5080d0ba11 100644 --- a/tests/api_resources/argo/test_smart_routing.py +++ b/tests/api_resources/argo/test_smart_routing.py @@ -9,7 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.argo import SmartRoutingGetResponse, SmartRoutingEditResponse +from cloudflare.types.argo.smart_routing_get_response import SmartRoutingGetResponse +from cloudflare.types.argo.smart_routing_edit_response import SmartRoutingEditResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/argo/test_tiered_caching.py b/tests/api_resources/argo/test_tiered_caching.py index 13d8943f000..e9c0d454595 100644 --- a/tests/api_resources/argo/test_tiered_caching.py +++ b/tests/api_resources/argo/test_tiered_caching.py @@ -9,7 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.argo import TieredCachingGetResponse, TieredCachingEditResponse +from cloudflare.types.argo.tiered_caching_get_response import TieredCachingGetResponse +from cloudflare.types.argo.tiered_caching_edit_response import TieredCachingEditResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/billing/test_profiles.py b/tests/api_resources/billing/test_profiles.py index 63e0a0eca24..4b9416d2dbf 100644 --- a/tests/api_resources/billing/test_profiles.py +++ b/tests/api_resources/billing/test_profiles.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.billing import ProfileGetResponse +from cloudflare.types.billing.profile_get_response import ProfileGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/cache/test_cache_reserve.py b/tests/api_resources/cache/test_cache_reserve.py index a6543e9e10e..ba5feb7dc37 100644 --- a/tests/api_resources/cache/test_cache_reserve.py +++ b/tests/api_resources/cache/test_cache_reserve.py @@ -9,12 +9,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.cache import ( - CacheReserveGetResponse, - CacheReserveEditResponse, - CacheReserveClearResponse, - CacheReserveStatusResponse, -) +from cloudflare.types.cache.cache_reserve_get_response import CacheReserveGetResponse +from cloudflare.types.cache.cache_reserve_edit_response import CacheReserveEditResponse +from cloudflare.types.cache.cache_reserve_clear_response import CacheReserveClearResponse +from cloudflare.types.cache.cache_reserve_status_response import CacheReserveStatusResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/cache/test_regional_tiered_cache.py b/tests/api_resources/cache/test_regional_tiered_cache.py index 0a440eaae86..74247e9092d 100644 --- a/tests/api_resources/cache/test_regional_tiered_cache.py +++ b/tests/api_resources/cache/test_regional_tiered_cache.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.cache import ( - RegionalTieredCacheGetResponse, - RegionalTieredCacheEditResponse, -) +from cloudflare.types.cache.regional_tiered_cache_get_response import RegionalTieredCacheGetResponse +from cloudflare.types.cache.regional_tiered_cache_edit_response import RegionalTieredCacheEditResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/cache/test_smart_tiered_cache.py b/tests/api_resources/cache/test_smart_tiered_cache.py index a45c9af8dba..4b8df77a630 100644 --- a/tests/api_resources/cache/test_smart_tiered_cache.py +++ b/tests/api_resources/cache/test_smart_tiered_cache.py @@ -9,11 +9,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.cache import ( - SmartTieredCacheGetResponse, - SmartTieredCacheEditResponse, - SmartTieredCacheDeleteResponse, -) +from cloudflare.types.cache.smart_tiered_cache_get_response import SmartTieredCacheGetResponse +from cloudflare.types.cache.smart_tiered_cache_edit_response import SmartTieredCacheEditResponse +from cloudflare.types.cache.smart_tiered_cache_delete_response import SmartTieredCacheDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/cache/test_variants.py b/tests/api_resources/cache/test_variants.py index bd8c3ef6f89..a790a25d6c6 100644 --- a/tests/api_resources/cache/test_variants.py +++ b/tests/api_resources/cache/test_variants.py @@ -9,11 +9,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.cache import ( - CacheVariant, - VariantGetResponse, - VariantEditResponse, -) +from cloudflare.types.cache.cache_variant import CacheVariant +from cloudflare.types.cache.variant_get_response import VariantGetResponse +from cloudflare.types.cache.variant_edit_response import VariantEditResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/certificate_authorities/test_hostname_associations.py b/tests/api_resources/certificate_authorities/test_hostname_associations.py index bd14519e2c5..ce33f3b87ff 100644 --- a/tests/api_resources/certificate_authorities/test_hostname_associations.py +++ b/tests/api_resources/certificate_authorities/test_hostname_associations.py @@ -9,8 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.certificate_authorities import ( - HostnameAssociationGetResponse, +from cloudflare.types.certificate_authorities.hostname_association_get_response import HostnameAssociationGetResponse +from cloudflare.types.certificate_authorities.hostname_association_update_response import ( HostnameAssociationUpdateResponse, ) diff --git a/tests/api_resources/challenges/test_widgets.py b/tests/api_resources/challenges/test_widgets.py index 976f29aaf82..a87a1021b16 100644 --- a/tests/api_resources/challenges/test_widgets.py +++ b/tests/api_resources/challenges/test_widgets.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.challenges import ( - Widget, - WidgetListResponse, -) +from cloudflare.types.challenges.widget import Widget +from cloudflare.types.challenges.widget_list_response import WidgetListResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/cloudforce_one/requests/test_message.py b/tests/api_resources/cloudforce_one/requests/test_message.py index ea91ab0a36e..54822be59d5 100644 --- a/tests/api_resources/cloudforce_one/requests/test_message.py +++ b/tests/api_resources/cloudforce_one/requests/test_message.py @@ -10,11 +10,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.cloudforce_one.requests import ( - Message, - MessageGetResponse, - MessageDeleteResponse, -) +from cloudflare.types.cloudforce_one.requests.message import Message +from cloudflare.types.cloudforce_one.requests.message_get_response import MessageGetResponse +from cloudflare.types.cloudforce_one.requests.message_delete_response import MessageDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/cloudforce_one/requests/test_priority.py b/tests/api_resources/cloudforce_one/requests/test_priority.py index 136d392955d..9b3aa3fffdc 100644 --- a/tests/api_resources/cloudforce_one/requests/test_priority.py +++ b/tests/api_resources/cloudforce_one/requests/test_priority.py @@ -9,11 +9,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.cloudforce_one import Item, Quota -from cloudflare.types.cloudforce_one.requests import ( - Priority, - PriorityDeleteResponse, -) +from cloudflare.types.cloudforce_one.item import Item +from cloudflare.types.cloudforce_one.quota import Quota +from cloudflare.types.cloudforce_one.requests.priority import Priority +from cloudflare.types.cloudforce_one.requests.priority_delete_response import PriorityDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/cloudforce_one/test_requests.py b/tests/api_resources/cloudforce_one/test_requests.py index ef62fc92095..c39acd3c50c 100644 --- a/tests/api_resources/cloudforce_one/test_requests.py +++ b/tests/api_resources/cloudforce_one/test_requests.py @@ -11,14 +11,12 @@ from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.cloudforce_one import ( - Item, - Quota, - ListItem, - RequestTypes, - RequestConstants, - RequestDeleteResponse, -) +from cloudflare.types.cloudforce_one.item import Item +from cloudflare.types.cloudforce_one.quota import Quota +from cloudflare.types.cloudforce_one.list_item import ListItem +from cloudflare.types.cloudforce_one.request_types import RequestTypes +from cloudflare.types.cloudforce_one.request_constants import RequestConstants +from cloudflare.types.cloudforce_one.request_delete_response import RequestDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/custom_certificates/test_prioritize.py b/tests/api_resources/custom_certificates/test_prioritize.py index 06419cda056..74cd185a801 100644 --- a/tests/api_resources/custom_certificates/test_prioritize.py +++ b/tests/api_resources/custom_certificates/test_prioritize.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.custom_certificates import PrioritizeUpdateResponse +from cloudflare.types.custom_certificates.prioritize_update_response import PrioritizeUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/custom_hostnames/test_fallback_origin.py b/tests/api_resources/custom_hostnames/test_fallback_origin.py index ba04772700c..67c87c3bbb3 100644 --- a/tests/api_resources/custom_hostnames/test_fallback_origin.py +++ b/tests/api_resources/custom_hostnames/test_fallback_origin.py @@ -9,11 +9,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.custom_hostnames import ( - FallbackOriginGetResponse, - FallbackOriginDeleteResponse, - FallbackOriginUpdateResponse, -) +from cloudflare.types.custom_hostnames.fallback_origin_get_response import FallbackOriginGetResponse +from cloudflare.types.custom_hostnames.fallback_origin_delete_response import FallbackOriginDeleteResponse +from cloudflare.types.custom_hostnames.fallback_origin_update_response import FallbackOriginUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/d1/test_database.py b/tests/api_resources/d1/test_database.py index 8005deeea4b..e651a529153 100644 --- a/tests/api_resources/d1/test_database.py +++ b/tests/api_resources/d1/test_database.py @@ -9,14 +9,12 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.d1 import ( - D1, - DatabaseListResponse, - DatabaseQueryResponse, - DatabaseCreateResponse, - DatabaseDeleteResponse, -) from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray +from cloudflare.types.d1.d1 import D1 +from cloudflare.types.d1.database_list_response import DatabaseListResponse +from cloudflare.types.d1.database_query_response import DatabaseQueryResponse +from cloudflare.types.d1.database_create_response import DatabaseCreateResponse +from cloudflare.types.d1.database_delete_response import DatabaseDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/dcv_delegation/test_uuid.py b/tests/api_resources/dcv_delegation/test_uuid.py index 0bb10895bed..b579d630a43 100644 --- a/tests/api_resources/dcv_delegation/test_uuid.py +++ b/tests/api_resources/dcv_delegation/test_uuid.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.dcv_delegation import DCVDelegationUUID +from cloudflare.types.dcv_delegation.dcv_delegation_uuid import DCVDelegationUUID base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/diagnostics/test_traceroutes.py b/tests/api_resources/diagnostics/test_traceroutes.py index 748aa9cc8d5..016476eebe5 100644 --- a/tests/api_resources/diagnostics/test_traceroutes.py +++ b/tests/api_resources/diagnostics/test_traceroutes.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.diagnostics import TracerouteCreateResponse +from cloudflare.types.diagnostics.traceroute_create_response import TracerouteCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/dns/analytics/reports/test_bytimes.py b/tests/api_resources/dns/analytics/reports/test_bytimes.py index 759ac8524ba..5959ed99263 100644 --- a/tests/api_resources/dns/analytics/reports/test_bytimes.py +++ b/tests/api_resources/dns/analytics/reports/test_bytimes.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.dns.analytics.reports import ByTime +from cloudflare.types.dns.analytics.reports.by_time import ByTime base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/dns/analytics/test_reports.py b/tests/api_resources/dns/analytics/test_reports.py index e91585a73ec..bdf0584439e 100644 --- a/tests/api_resources/dns/analytics/test_reports.py +++ b/tests/api_resources/dns/analytics/test_reports.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.dns.analytics import Report +from cloudflare.types.dns.analytics.report import Report base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/dns/firewall/analytics/reports/test_bytimes.py b/tests/api_resources/dns/firewall/analytics/reports/test_bytimes.py index ba39224909a..afa2d3787af 100644 --- a/tests/api_resources/dns/firewall/analytics/reports/test_bytimes.py +++ b/tests/api_resources/dns/firewall/analytics/reports/test_bytimes.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.dns.analytics.reports import ByTime +from cloudflare.types.dns.analytics.reports.by_time import ByTime base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/dns/firewall/analytics/test_reports.py b/tests/api_resources/dns/firewall/analytics/test_reports.py index 32369b249a7..3229cd5a8ac 100644 --- a/tests/api_resources/dns/firewall/analytics/test_reports.py +++ b/tests/api_resources/dns/firewall/analytics/test_reports.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.dns.analytics import Report +from cloudflare.types.dns.analytics.report import Report base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/dns/test_firewall.py b/tests/api_resources/dns/test_firewall.py index 27ba16285fd..e6b536e9e09 100644 --- a/tests/api_resources/dns/test_firewall.py +++ b/tests/api_resources/dns/test_firewall.py @@ -9,11 +9,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.dns import ( - FirewallDeleteResponse, -) from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.dns.firewall import Firewall +from cloudflare.types.dns.firewall.firewall import Firewall +from cloudflare.types.dns.firewall_delete_response import FirewallDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/dns/test_records.py b/tests/api_resources/dns/test_records.py index 2ce8d27f332..6999945188d 100644 --- a/tests/api_resources/dns/test_records.py +++ b/tests/api_resources/dns/test_records.py @@ -9,13 +9,11 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.dns import ( - Record, - RecordScanResponse, - RecordDeleteResponse, - RecordImportResponse, -) from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray +from cloudflare.types.dns.record import Record +from cloudflare.types.dns.record_scan_response import RecordScanResponse +from cloudflare.types.dns.record_delete_response import RecordDeleteResponse +from cloudflare.types.dns.record_import_response import RecordImportResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/durable_objects/namespaces/test_objects.py b/tests/api_resources/durable_objects/namespaces/test_objects.py index 3273c4e5eda..61c1048c00e 100644 --- a/tests/api_resources/durable_objects/namespaces/test_objects.py +++ b/tests/api_resources/durable_objects/namespaces/test_objects.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncCursorLimitPagination, AsyncCursorLimitPagination -from cloudflare.types.durable_objects.namespaces import DurableObject +from cloudflare.types.durable_objects.namespaces.durable_object import DurableObject base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/durable_objects/test_namespaces.py b/tests/api_resources/durable_objects/test_namespaces.py index ca9f1d784cc..f983ae2a822 100644 --- a/tests/api_resources/durable_objects/test_namespaces.py +++ b/tests/api_resources/durable_objects/test_namespaces.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.durable_objects import Namespace +from cloudflare.types.durable_objects.namespace import Namespace base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/email_routing/rules/test_catch_alls.py b/tests/api_resources/email_routing/rules/test_catch_alls.py index e0901a6d600..94505eb592c 100644 --- a/tests/api_resources/email_routing/rules/test_catch_alls.py +++ b/tests/api_resources/email_routing/rules/test_catch_alls.py @@ -9,7 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.email_routing.rules import CatchAllGetResponse, CatchAllUpdateResponse +from cloudflare.types.email_routing.rules.catch_all_get_response import CatchAllGetResponse +from cloudflare.types.email_routing.rules.catch_all_update_response import CatchAllUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/email_routing/test_addresses.py b/tests/api_resources/email_routing/test_addresses.py index 76bbe3c7794..e362ccaa7f2 100644 --- a/tests/api_resources/email_routing/test_addresses.py +++ b/tests/api_resources/email_routing/test_addresses.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.email_routing import Address +from cloudflare.types.email_routing.address import Address base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/email_routing/test_dns.py b/tests/api_resources/email_routing/test_dns.py index c4831f6464d..0a5b5b2d451 100644 --- a/tests/api_resources/email_routing/test_dns.py +++ b/tests/api_resources/email_routing/test_dns.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.email_routing import DNSGetResponse +from cloudflare.types.email_routing.dns_get_response import DNSGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/email_routing/test_rules.py b/tests/api_resources/email_routing/test_rules.py index f38bc2e6c60..4e8e84f075a 100644 --- a/tests/api_resources/email_routing/test_rules.py +++ b/tests/api_resources/email_routing/test_rules.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.email_routing import EmailRoutingRule +from cloudflare.types.email_routing.email_routing_rule import EmailRoutingRule base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/event_notifications/r2/configuration/test_queues.py b/tests/api_resources/event_notifications/r2/configuration/test_queues.py index 86d44184798..1f9bd041955 100644 --- a/tests/api_resources/event_notifications/r2/configuration/test_queues.py +++ b/tests/api_resources/event_notifications/r2/configuration/test_queues.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.event_notifications.r2.configuration import ( - QueueDeleteResponse, - QueueUpdateResponse, -) +from cloudflare.types.event_notifications.r2.configuration.queue_delete_response import QueueDeleteResponse +from cloudflare.types.event_notifications.r2.configuration.queue_update_response import QueueUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/event_notifications/r2/test_configuration.py b/tests/api_resources/event_notifications/r2/test_configuration.py index 7fb8bfb1965..0ce207dd3c6 100644 --- a/tests/api_resources/event_notifications/r2/test_configuration.py +++ b/tests/api_resources/event_notifications/r2/test_configuration.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.event_notifications.r2 import ConfigurationGetResponse +from cloudflare.types.event_notifications.r2.configuration_get_response import ConfigurationGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/firewall/test_access_rules.py b/tests/api_resources/firewall/test_access_rules.py index 25d2152c462..ae4f4f43e6a 100644 --- a/tests/api_resources/firewall/test_access_rules.py +++ b/tests/api_resources/firewall/test_access_rules.py @@ -10,12 +10,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.firewall import ( - AccessRuleGetResponse, - AccessRuleEditResponse, - AccessRuleCreateResponse, - AccessRuleDeleteResponse, -) +from cloudflare.types.firewall.access_rule_get_response import AccessRuleGetResponse +from cloudflare.types.firewall.access_rule_edit_response import AccessRuleEditResponse +from cloudflare.types.firewall.access_rule_create_response import AccessRuleCreateResponse +from cloudflare.types.firewall.access_rule_delete_response import AccessRuleDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/firewall/test_lockdowns.py b/tests/api_resources/firewall/test_lockdowns.py index 2295de8f29f..0afdb920d28 100644 --- a/tests/api_resources/firewall/test_lockdowns.py +++ b/tests/api_resources/firewall/test_lockdowns.py @@ -11,10 +11,8 @@ from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.firewall import ( - Lockdown, - LockdownDeleteResponse, -) +from cloudflare.types.firewall.lockdown import Lockdown +from cloudflare.types.firewall.lockdown_delete_response import LockdownDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/firewall/test_rules.py b/tests/api_resources/firewall/test_rules.py index 5ac53c629f5..7bd380f77e1 100644 --- a/tests/api_resources/firewall/test_rules.py +++ b/tests/api_resources/firewall/test_rules.py @@ -10,11 +10,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.firewall import ( - FirewallRule, - RuleEditResponse, - RuleCreateResponse, -) +from cloudflare.types.firewall.firewall_rule import FirewallRule +from cloudflare.types.firewall.rule_edit_response import RuleEditResponse +from cloudflare.types.firewall.rule_create_response import RuleCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/firewall/test_ua_rules.py b/tests/api_resources/firewall/test_ua_rules.py index ab5a374f1c4..4b9c99603c2 100644 --- a/tests/api_resources/firewall/test_ua_rules.py +++ b/tests/api_resources/firewall/test_ua_rules.py @@ -10,13 +10,11 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.firewall import ( - UARuleGetResponse, - UARuleListResponse, - UARuleCreateResponse, - UARuleDeleteResponse, - UARuleUpdateResponse, -) +from cloudflare.types.firewall.ua_rule_get_response import UARuleGetResponse +from cloudflare.types.firewall.ua_rule_list_response import UARuleListResponse +from cloudflare.types.firewall.ua_rule_create_response import UARuleCreateResponse +from cloudflare.types.firewall.ua_rule_delete_response import UARuleDeleteResponse +from cloudflare.types.firewall.ua_rule_update_response import UARuleUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/firewall/waf/packages/test_groups.py b/tests/api_resources/firewall/waf/packages/test_groups.py index 9fc8f82f467..6297b160c03 100644 --- a/tests/api_resources/firewall/waf/packages/test_groups.py +++ b/tests/api_resources/firewall/waf/packages/test_groups.py @@ -10,11 +10,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.firewall.waf.packages import ( - Group, - GroupGetResponse, - GroupEditResponse, -) +from cloudflare.types.firewall.waf.packages.group import Group +from cloudflare.types.firewall.waf.packages.group_get_response import GroupGetResponse +from cloudflare.types.firewall.waf.packages.group_edit_response import GroupEditResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/firewall/waf/packages/test_rules.py b/tests/api_resources/firewall/waf/packages/test_rules.py index 772dd3a3128..710c1f57117 100644 --- a/tests/api_resources/firewall/waf/packages/test_rules.py +++ b/tests/api_resources/firewall/waf/packages/test_rules.py @@ -10,11 +10,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.firewall.waf.packages import ( - RuleGetResponse, - RuleEditResponse, - RuleListResponse, -) +from cloudflare.types.firewall.waf.packages.rule_get_response import RuleGetResponse +from cloudflare.types.firewall.waf.packages.rule_edit_response import RuleEditResponse +from cloudflare.types.firewall.waf.packages.rule_list_response import RuleListResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/firewall/waf/test_overrides.py b/tests/api_resources/firewall/waf/test_overrides.py index b27cefd5f67..d522f91966e 100644 --- a/tests/api_resources/firewall/waf/test_overrides.py +++ b/tests/api_resources/firewall/waf/test_overrides.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.firewall.waf import ( - Override, - OverrideDeleteResponse, -) +from cloudflare.types.firewall.waf.override import Override +from cloudflare.types.firewall.waf.override_delete_response import OverrideDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/firewall/waf/test_packages.py b/tests/api_resources/firewall/waf/test_packages.py index 405a42b1221..360c75560ee 100644 --- a/tests/api_resources/firewall/waf/test_packages.py +++ b/tests/api_resources/firewall/waf/test_packages.py @@ -10,7 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.firewall.waf import PackageGetResponse, PackageListResponse +from cloudflare.types.firewall.waf.package_get_response import PackageGetResponse +from cloudflare.types.firewall.waf.package_list_response import PackageListResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/healthchecks/test_previews.py b/tests/api_resources/healthchecks/test_previews.py index a5eba5e0e78..83cc4499eb4 100644 --- a/tests/api_resources/healthchecks/test_previews.py +++ b/tests/api_resources/healthchecks/test_previews.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.healthchecks import ( - Healthcheck, - PreviewDeleteResponse, -) +from cloudflare.types.healthchecks.healthcheck import Healthcheck +from cloudflare.types.healthchecks.preview_delete_response import PreviewDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/hostnames/settings/test_tls.py b/tests/api_resources/hostnames/settings/test_tls.py index 889e06e7b7e..abe5159537a 100644 --- a/tests/api_resources/hostnames/settings/test_tls.py +++ b/tests/api_resources/hostnames/settings/test_tls.py @@ -9,11 +9,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.hostnames.settings import ( - Setting, - TLSGetResponse, - TLSDeleteResponse, -) +from cloudflare.types.hostnames.settings.setting import Setting +from cloudflare.types.hostnames.settings.tls_get_response import TLSGetResponse +from cloudflare.types.hostnames.settings.tls_delete_response import TLSDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/hyperdrive/test_configs.py b/tests/api_resources/hyperdrive/test_configs.py index 1170bd21c14..66cfb2bf678 100644 --- a/tests/api_resources/hyperdrive/test_configs.py +++ b/tests/api_resources/hyperdrive/test_configs.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.hyperdrive import ( - Hyperdrive, - ConfigDeleteResponse, -) +from cloudflare.types.hyperdrive.hyperdrive import Hyperdrive +from cloudflare.types.hyperdrive.config_delete_response import ConfigDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/images/test_v1.py b/tests/api_resources/images/test_v1.py index dd02d217f8d..fc6ab9d69f0 100644 --- a/tests/api_resources/images/test_v1.py +++ b/tests/api_resources/images/test_v1.py @@ -10,11 +10,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncV4PagePagination, AsyncV4PagePagination -from cloudflare.types.images import ( - Image, - V1ListResponse, - V1DeleteResponse, -) +from cloudflare.types.images.image import Image +from cloudflare.types.images.v1_list_response import V1ListResponse +from cloudflare.types.images.v1_delete_response import V1DeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/images/test_v2.py b/tests/api_resources/images/test_v2.py index b40c7c1b94a..cad004cfc42 100644 --- a/tests/api_resources/images/test_v2.py +++ b/tests/api_resources/images/test_v2.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.images import V2ListResponse +from cloudflare.types.images.v2_list_response import V2ListResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/images/v1/test_keys.py b/tests/api_resources/images/v1/test_keys.py index 42691cb49b0..24ec699ed7c 100644 --- a/tests/api_resources/images/v1/test_keys.py +++ b/tests/api_resources/images/v1/test_keys.py @@ -9,7 +9,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.images.v1 import KeyListResponse, KeyDeleteResponse, KeyUpdateResponse +from cloudflare.types.images.v1.key_list_response import KeyListResponse +from cloudflare.types.images.v1.key_delete_response import KeyDeleteResponse +from cloudflare.types.images.v1.key_update_response import KeyUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/images/v1/test_stats.py b/tests/api_resources/images/v1/test_stats.py index d2ea3b07cbb..bc63e4b3200 100644 --- a/tests/api_resources/images/v1/test_stats.py +++ b/tests/api_resources/images/v1/test_stats.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.images.v1 import Stat +from cloudflare.types.images.v1.stat import Stat base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/images/v1/test_variants.py b/tests/api_resources/images/v1/test_variants.py index 7cf913e80f6..f0b82621cf7 100644 --- a/tests/api_resources/images/v1/test_variants.py +++ b/tests/api_resources/images/v1/test_variants.py @@ -9,13 +9,11 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.images.v1 import ( - Variant, - VariantGetResponse, - VariantEditResponse, - VariantCreateResponse, - VariantDeleteResponse, -) +from cloudflare.types.images.v1.variant import Variant +from cloudflare.types.images.v1.variant_get_response import VariantGetResponse +from cloudflare.types.images.v1.variant_edit_response import VariantEditResponse +from cloudflare.types.images.v1.variant_create_response import VariantCreateResponse +from cloudflare.types.images.v1.variant_delete_response import VariantDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/images/v2/test_direct_uploads.py b/tests/api_resources/images/v2/test_direct_uploads.py index a9ed5cc45d6..43d7ea9735b 100644 --- a/tests/api_resources/images/v2/test_direct_uploads.py +++ b/tests/api_resources/images/v2/test_direct_uploads.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.images.v2 import DirectUploadCreateResponse +from cloudflare.types.images.v2.direct_upload_create_response import DirectUploadCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/intel/asn/test_subnets.py b/tests/api_resources/intel/asn/test_subnets.py index 3014e7984ef..569fbd0a4fe 100644 --- a/tests/api_resources/intel/asn/test_subnets.py +++ b/tests/api_resources/intel/asn/test_subnets.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.intel.asn import SubnetGetResponse +from cloudflare.types.intel.asn.subnet_get_response import SubnetGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/intel/attack_surface_report/test_issue_types.py b/tests/api_resources/intel/attack_surface_report/test_issue_types.py index 1274cb4c67d..8bc0538f087 100644 --- a/tests/api_resources/intel/attack_surface_report/test_issue_types.py +++ b/tests/api_resources/intel/attack_surface_report/test_issue_types.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.intel.attack_surface_report import IssueTypeGetResponse +from cloudflare.types.intel.attack_surface_report.issue_type_get_response import IssueTypeGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/intel/attack_surface_report/test_issues.py b/tests/api_resources/intel/attack_surface_report/test_issues.py index 31bd421e533..52094c38239 100644 --- a/tests/api_resources/intel/attack_surface_report/test_issues.py +++ b/tests/api_resources/intel/attack_surface_report/test_issues.py @@ -10,13 +10,11 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncV4PagePagination, AsyncV4PagePagination -from cloudflare.types.intel.attack_surface_report import ( - IssueListResponse, - IssueTypeResponse, - IssueClassResponse, - IssueDismissResponse, - IssueSeverityResponse, -) +from cloudflare.types.intel.attack_surface_report.issue_list_response import IssueListResponse +from cloudflare.types.intel.attack_surface_report.issue_type_response import IssueTypeResponse +from cloudflare.types.intel.attack_surface_report.issue_class_response import IssueClassResponse +from cloudflare.types.intel.attack_surface_report.issue_dismiss_response import IssueDismissResponse +from cloudflare.types.intel.attack_surface_report.issue_severity_response import IssueSeverityResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/intel/domains/test_bulks.py b/tests/api_resources/intel/domains/test_bulks.py index 10054a63d1c..219c656996e 100644 --- a/tests/api_resources/intel/domains/test_bulks.py +++ b/tests/api_resources/intel/domains/test_bulks.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.intel.domains import BulkGetResponse +from cloudflare.types.intel.domains.bulk_get_response import BulkGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/intel/indicator_feeds/test_permissions.py b/tests/api_resources/intel/indicator_feeds/test_permissions.py index f7da59f2cda..dc86ad524b0 100644 --- a/tests/api_resources/intel/indicator_feeds/test_permissions.py +++ b/tests/api_resources/intel/indicator_feeds/test_permissions.py @@ -9,11 +9,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.intel.indicator_feeds import ( - PermissionListResponse, - PermissionCreateResponse, - PermissionDeleteResponse, -) +from cloudflare.types.intel.indicator_feeds.permission_list_response import PermissionListResponse +from cloudflare.types.intel.indicator_feeds.permission_create_response import PermissionCreateResponse +from cloudflare.types.intel.indicator_feeds.permission_delete_response import PermissionDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/intel/test_asn.py b/tests/api_resources/intel/test_asn.py index 125ac1e76c0..e6422689e81 100644 --- a/tests/api_resources/intel/test_asn.py +++ b/tests/api_resources/intel/test_asn.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.shared import ASN +from cloudflare.types.shared.asn import ASN base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/intel/test_dns.py b/tests/api_resources/intel/test_dns.py index 0c916acc860..16030078128 100644 --- a/tests/api_resources/intel/test_dns.py +++ b/tests/api_resources/intel/test_dns.py @@ -11,7 +11,7 @@ from tests.utils import assert_matches_type from cloudflare._utils import parse_date from cloudflare.pagination import SyncV4PagePagination, AsyncV4PagePagination -from cloudflare.types.intel import DNSListResponse +from cloudflare.types.intel.dns_list_response import DNSListResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/intel/test_domain_history.py b/tests/api_resources/intel/test_domain_history.py index 811ded0a843..f3393ae4f65 100644 --- a/tests/api_resources/intel/test_domain_history.py +++ b/tests/api_resources/intel/test_domain_history.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.intel import DomainHistoryGetResponse +from cloudflare.types.intel.domain_history_get_response import DomainHistoryGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/intel/test_domains.py b/tests/api_resources/intel/test_domains.py index ccf650a3380..181c005a139 100644 --- a/tests/api_resources/intel/test_domains.py +++ b/tests/api_resources/intel/test_domains.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.intel import Domain +from cloudflare.types.intel.domain import Domain base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/intel/test_indicator_feeds.py b/tests/api_resources/intel/test_indicator_feeds.py index 956f15c0233..11ae20c41d6 100644 --- a/tests/api_resources/intel/test_indicator_feeds.py +++ b/tests/api_resources/intel/test_indicator_feeds.py @@ -10,12 +10,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.intel import ( - IndicatorFeedGetResponse, - IndicatorFeedListResponse, - IndicatorFeedCreateResponse, - IndicatorFeedUpdateResponse, -) +from cloudflare.types.intel.indicator_feed_get_response import IndicatorFeedGetResponse +from cloudflare.types.intel.indicator_feed_list_response import IndicatorFeedListResponse +from cloudflare.types.intel.indicator_feed_create_response import IndicatorFeedCreateResponse +from cloudflare.types.intel.indicator_feed_update_response import IndicatorFeedUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/intel/test_ip_lists.py b/tests/api_resources/intel/test_ip_lists.py index 2adbe284b62..a65b25a285a 100644 --- a/tests/api_resources/intel/test_ip_lists.py +++ b/tests/api_resources/intel/test_ip_lists.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.intel import IPListGetResponse +from cloudflare.types.intel.ip_list_get_response import IPListGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/intel/test_ips.py b/tests/api_resources/intel/test_ips.py index 8956bb8c5fa..4abc4a1db52 100644 --- a/tests/api_resources/intel/test_ips.py +++ b/tests/api_resources/intel/test_ips.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.intel import IPGetResponse +from cloudflare.types.intel.ip_get_response import IPGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/intel/test_miscategorizations.py b/tests/api_resources/intel/test_miscategorizations.py index 8231ba952c5..8e769f28565 100644 --- a/tests/api_resources/intel/test_miscategorizations.py +++ b/tests/api_resources/intel/test_miscategorizations.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.intel import MiscategorizationCreateResponse +from cloudflare.types.intel.miscategorization_create_response import MiscategorizationCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/intel/test_sinkholes.py b/tests/api_resources/intel/test_sinkholes.py index 9c3ac5abb15..e9086908383 100644 --- a/tests/api_resources/intel/test_sinkholes.py +++ b/tests/api_resources/intel/test_sinkholes.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.intel import Sinkhole +from cloudflare.types.intel.sinkhole import Sinkhole base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/intel/test_whois.py b/tests/api_resources/intel/test_whois.py index 5f42548c43b..00343224cdb 100644 --- a/tests/api_resources/intel/test_whois.py +++ b/tests/api_resources/intel/test_whois.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.intel import Whois +from cloudflare.types.intel.whois import Whois base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/kv/namespaces/test_bulk.py b/tests/api_resources/kv/namespaces/test_bulk.py index 50d6d3c6d99..9732acf1d42 100644 --- a/tests/api_resources/kv/namespaces/test_bulk.py +++ b/tests/api_resources/kv/namespaces/test_bulk.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.kv.namespaces import ( - BulkDeleteResponse, - BulkUpdateResponse, -) +from cloudflare.types.kv.namespaces.bulk_delete_response import BulkDeleteResponse +from cloudflare.types.kv.namespaces.bulk_update_response import BulkUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/kv/namespaces/test_keys.py b/tests/api_resources/kv/namespaces/test_keys.py index 36b5cad82c6..e7fcfee6fb5 100644 --- a/tests/api_resources/kv/namespaces/test_keys.py +++ b/tests/api_resources/kv/namespaces/test_keys.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncCursorLimitPagination, AsyncCursorLimitPagination -from cloudflare.types.kv.namespaces import Key +from cloudflare.types.kv.namespaces.key import Key base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/kv/namespaces/test_values.py b/tests/api_resources/kv/namespaces/test_values.py index 9003443b5e9..d6800fec3f8 100644 --- a/tests/api_resources/kv/namespaces/test_values.py +++ b/tests/api_resources/kv/namespaces/test_values.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.kv.namespaces import ( - ValueDeleteResponse, - ValueUpdateResponse, -) +from cloudflare.types.kv.namespaces.value_delete_response import ValueDeleteResponse +from cloudflare.types.kv.namespaces.value_update_response import ValueUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/kv/test_namespaces.py b/tests/api_resources/kv/test_namespaces.py index 2a4369f39d8..8ef7b4acd76 100644 --- a/tests/api_resources/kv/test_namespaces.py +++ b/tests/api_resources/kv/test_namespaces.py @@ -9,12 +9,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.kv import ( - Namespace, - NamespaceDeleteResponse, - NamespaceUpdateResponse, -) from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray +from cloudflare.types.kv.namespace import Namespace +from cloudflare.types.kv.namespace_delete_response import NamespaceDeleteResponse +from cloudflare.types.kv.namespace_update_response import NamespaceUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/load_balancers/monitors/test_previews.py b/tests/api_resources/load_balancers/monitors/test_previews.py index 791b255f075..3a5e48aedad 100644 --- a/tests/api_resources/load_balancers/monitors/test_previews.py +++ b/tests/api_resources/load_balancers/monitors/test_previews.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.load_balancers.monitors import PreviewCreateResponse +from cloudflare.types.load_balancers.monitors.preview_create_response import PreviewCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/load_balancers/monitors/test_references.py b/tests/api_resources/load_balancers/monitors/test_references.py index ac893043fec..ceeaa7015c9 100644 --- a/tests/api_resources/load_balancers/monitors/test_references.py +++ b/tests/api_resources/load_balancers/monitors/test_references.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.load_balancers.monitors import ReferenceGetResponse +from cloudflare.types.load_balancers.monitors.reference_get_response import ReferenceGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/load_balancers/pools/test_health.py b/tests/api_resources/load_balancers/pools/test_health.py index 13c1108bf5d..b10caa8c54c 100644 --- a/tests/api_resources/load_balancers/pools/test_health.py +++ b/tests/api_resources/load_balancers/pools/test_health.py @@ -9,7 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.load_balancers.pools import HealthGetResponse, HealthCreateResponse +from cloudflare.types.load_balancers.pools.health_get_response import HealthGetResponse +from cloudflare.types.load_balancers.pools.health_create_response import HealthCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/load_balancers/pools/test_references.py b/tests/api_resources/load_balancers/pools/test_references.py index 723f890e4e7..c45476633ba 100644 --- a/tests/api_resources/load_balancers/pools/test_references.py +++ b/tests/api_resources/load_balancers/pools/test_references.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.load_balancers.pools import ReferenceGetResponse +from cloudflare.types.load_balancers.pools.reference_get_response import ReferenceGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/load_balancers/test_monitors.py b/tests/api_resources/load_balancers/test_monitors.py index 1fc1f757124..946c94fbb58 100644 --- a/tests/api_resources/load_balancers/test_monitors.py +++ b/tests/api_resources/load_balancers/test_monitors.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.load_balancers import ( - Monitor, - MonitorDeleteResponse, -) +from cloudflare.types.load_balancers.monitor import Monitor +from cloudflare.types.load_balancers.monitor_delete_response import MonitorDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/load_balancers/test_pools.py b/tests/api_resources/load_balancers/test_pools.py index da5c771f17b..b0a3a6e5c88 100644 --- a/tests/api_resources/load_balancers/test_pools.py +++ b/tests/api_resources/load_balancers/test_pools.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.load_balancers import ( - Pool, - PoolDeleteResponse, -) +from cloudflare.types.load_balancers.pool import Pool +from cloudflare.types.load_balancers.pool_delete_response import PoolDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/load_balancers/test_previews.py b/tests/api_resources/load_balancers/test_previews.py index 588ab766d4a..7be32ceecb9 100644 --- a/tests/api_resources/load_balancers/test_previews.py +++ b/tests/api_resources/load_balancers/test_previews.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.load_balancers import PreviewGetResponse +from cloudflare.types.load_balancers.preview_get_response import PreviewGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/load_balancers/test_regions.py b/tests/api_resources/load_balancers/test_regions.py index ae7e7b8f3d4..55063ddc005 100644 --- a/tests/api_resources/load_balancers/test_regions.py +++ b/tests/api_resources/load_balancers/test_regions.py @@ -9,7 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.load_balancers import RegionGetResponse, RegionListResponse +from cloudflare.types.load_balancers.region_get_response import RegionGetResponse +from cloudflare.types.load_balancers.region_list_response import RegionListResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/load_balancers/test_searches.py b/tests/api_resources/load_balancers/test_searches.py index 22949e8c586..6ab871c3021 100644 --- a/tests/api_resources/load_balancers/test_searches.py +++ b/tests/api_resources/load_balancers/test_searches.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.load_balancers import SearchGetResponse +from cloudflare.types.load_balancers.search_get_response import SearchGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/logpush/datasets/test_jobs.py b/tests/api_resources/logpush/datasets/test_jobs.py index d15c3873dd5..e65ea0b6394 100644 --- a/tests/api_resources/logpush/datasets/test_jobs.py +++ b/tests/api_resources/logpush/datasets/test_jobs.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.logpush.datasets import JobGetResponse +from cloudflare.types.logpush.datasets.job_get_response import JobGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/logpush/test_edge.py b/tests/api_resources/logpush/test_edge.py index b1bdf576c70..a26292567a3 100644 --- a/tests/api_resources/logpush/test_edge.py +++ b/tests/api_resources/logpush/test_edge.py @@ -9,7 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.logpush import EdgeGetResponse, InstantLogpushJob +from cloudflare.types.logpush.edge_get_response import EdgeGetResponse +from cloudflare.types.logpush.instant_logpush_job import InstantLogpushJob base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/logpush/test_jobs.py b/tests/api_resources/logpush/test_jobs.py index 00c5ac7f89a..3d243709d0e 100644 --- a/tests/api_resources/logpush/test_jobs.py +++ b/tests/api_resources/logpush/test_jobs.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.logpush import LogpushJob +from cloudflare.types.logpush.logpush_job import LogpushJob base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/logpush/test_ownership.py b/tests/api_resources/logpush/test_ownership.py index 034653393d7..21ff01d1960 100644 --- a/tests/api_resources/logpush/test_ownership.py +++ b/tests/api_resources/logpush/test_ownership.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.logpush import ( - OwnershipValidation, - OwnershipCreateResponse, -) +from cloudflare.types.logpush.ownership_validation import OwnershipValidation +from cloudflare.types.logpush.ownership_create_response import OwnershipCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/logpush/test_validate.py b/tests/api_resources/logpush/test_validate.py index c56ba0f660c..51aad1568b6 100644 --- a/tests/api_resources/logpush/test_validate.py +++ b/tests/api_resources/logpush/test_validate.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.logpush import ( - ValidateOriginResponse, - ValidateDestinationResponse, -) +from cloudflare.types.logpush.validate_origin_response import ValidateOriginResponse +from cloudflare.types.logpush.validate_destination_response import ValidateDestinationResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/logs/control/cmb/test_config.py b/tests/api_resources/logs/control/cmb/test_config.py index 20b0222ef19..6849b57fe85 100644 --- a/tests/api_resources/logs/control/cmb/test_config.py +++ b/tests/api_resources/logs/control/cmb/test_config.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.logs.control.cmb import CmbConfig +from cloudflare.types.logs.control.cmb.cmb_config import CmbConfig base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/logs/control/retention/test_flag.py b/tests/api_resources/logs/control/retention/test_flag.py index a6fce61750f..d1fe897bdbc 100644 --- a/tests/api_resources/logs/control/retention/test_flag.py +++ b/tests/api_resources/logs/control/retention/test_flag.py @@ -9,7 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.logs.control.retention import FlagGetResponse, FlagCreateResponse +from cloudflare.types.logs.control.retention.flag_get_response import FlagGetResponse +from cloudflare.types.logs.control.retention.flag_create_response import FlagCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/logs/received/test_fields.py b/tests/api_resources/logs/received/test_fields.py index 38a6509bf56..db946844262 100644 --- a/tests/api_resources/logs/received/test_fields.py +++ b/tests/api_resources/logs/received/test_fields.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.logs.received import FieldGetResponse +from cloudflare.types.logs.received.field_get_response import FieldGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/logs/test_rayid.py b/tests/api_resources/logs/test_rayid.py index a5264c4450a..a52b54fc51f 100644 --- a/tests/api_resources/logs/test_rayid.py +++ b/tests/api_resources/logs/test_rayid.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.logs import RayIDGetResponse +from cloudflare.types.logs.rayid_get_response import RayIDGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/logs/test_received.py b/tests/api_resources/logs/test_received.py index 38002e7e0f9..e47ab7841cb 100644 --- a/tests/api_resources/logs/test_received.py +++ b/tests/api_resources/logs/test_received.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.logs import ReceivedGetResponse +from cloudflare.types.logs.received_get_response import ReceivedGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/magic_network_monitoring/configs/test_full.py b/tests/api_resources/magic_network_monitoring/configs/test_full.py index 27f997aab52..19edd6942e9 100644 --- a/tests/api_resources/magic_network_monitoring/configs/test_full.py +++ b/tests/api_resources/magic_network_monitoring/configs/test_full.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.magic_network_monitoring import Configuration +from cloudflare.types.magic_network_monitoring.configuration import Configuration base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/magic_network_monitoring/rules/test_advertisements.py b/tests/api_resources/magic_network_monitoring/rules/test_advertisements.py index ab20ee89a26..ecd103ef496 100644 --- a/tests/api_resources/magic_network_monitoring/rules/test_advertisements.py +++ b/tests/api_resources/magic_network_monitoring/rules/test_advertisements.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.magic_network_monitoring.rules import Advertisement +from cloudflare.types.magic_network_monitoring.rules.advertisement import Advertisement base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/magic_network_monitoring/test_configs.py b/tests/api_resources/magic_network_monitoring/test_configs.py index b576e51b7e6..d1354b7f9cc 100644 --- a/tests/api_resources/magic_network_monitoring/test_configs.py +++ b/tests/api_resources/magic_network_monitoring/test_configs.py @@ -9,9 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.magic_network_monitoring import ( - Configuration, -) +from cloudflare.types.magic_network_monitoring.configuration import Configuration base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/magic_network_monitoring/test_rules.py b/tests/api_resources/magic_network_monitoring/test_rules.py index 2d5ba503284..fb02399bc0c 100644 --- a/tests/api_resources/magic_network_monitoring/test_rules.py +++ b/tests/api_resources/magic_network_monitoring/test_rules.py @@ -10,9 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.magic_network_monitoring import ( - MagicNetworkMonitoringRule, -) +from cloudflare.types.magic_network_monitoring.magic_network_monitoring_rule import MagicNetworkMonitoringRule base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/magic_transit/sites/test_acls.py b/tests/api_resources/magic_transit/sites/test_acls.py index c55c565aa3e..3cc7bbdf247 100644 --- a/tests/api_resources/magic_transit/sites/test_acls.py +++ b/tests/api_resources/magic_transit/sites/test_acls.py @@ -10,9 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.magic_transit.sites import ( - ACL, -) +from cloudflare.types.magic_transit.sites.acl import ACL base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/magic_transit/sites/test_lans.py b/tests/api_resources/magic_transit/sites/test_lans.py index 17828b6e628..9ab10d2780b 100644 --- a/tests/api_resources/magic_transit/sites/test_lans.py +++ b/tests/api_resources/magic_transit/sites/test_lans.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.magic_transit.sites import ( - LAN, - LANCreateResponse, -) +from cloudflare.types.magic_transit.sites.lan import LAN +from cloudflare.types.magic_transit.sites.lan_create_response import LANCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/magic_transit/sites/test_wans.py b/tests/api_resources/magic_transit/sites/test_wans.py index f047cf34b72..08eb99c288c 100644 --- a/tests/api_resources/magic_transit/sites/test_wans.py +++ b/tests/api_resources/magic_transit/sites/test_wans.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.magic_transit.sites import ( - WAN, - WANCreateResponse, -) +from cloudflare.types.magic_transit.sites.wan import WAN +from cloudflare.types.magic_transit.sites.wan_create_response import WANCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/magic_transit/test_cf_interconnects.py b/tests/api_resources/magic_transit/test_cf_interconnects.py index 1c04dbbae9f..0bc70ae2298 100644 --- a/tests/api_resources/magic_transit/test_cf_interconnects.py +++ b/tests/api_resources/magic_transit/test_cf_interconnects.py @@ -9,11 +9,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.magic_transit import ( - CfInterconnectGetResponse, - CfInterconnectListResponse, - CfInterconnectUpdateResponse, -) +from cloudflare.types.magic_transit.cf_interconnect_get_response import CfInterconnectGetResponse +from cloudflare.types.magic_transit.cf_interconnect_list_response import CfInterconnectListResponse +from cloudflare.types.magic_transit.cf_interconnect_update_response import CfInterconnectUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/magic_transit/test_gre_tunnels.py b/tests/api_resources/magic_transit/test_gre_tunnels.py index 41761c37795..ceec2e94870 100644 --- a/tests/api_resources/magic_transit/test_gre_tunnels.py +++ b/tests/api_resources/magic_transit/test_gre_tunnels.py @@ -9,13 +9,11 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.magic_transit import ( - GRETunnelGetResponse, - GRETunnelListResponse, - GRETunnelCreateResponse, - GRETunnelDeleteResponse, - GRETunnelUpdateResponse, -) +from cloudflare.types.magic_transit.gre_tunnel_get_response import GRETunnelGetResponse +from cloudflare.types.magic_transit.gre_tunnel_list_response import GRETunnelListResponse +from cloudflare.types.magic_transit.gre_tunnel_create_response import GRETunnelCreateResponse +from cloudflare.types.magic_transit.gre_tunnel_delete_response import GRETunnelDeleteResponse +from cloudflare.types.magic_transit.gre_tunnel_update_response import GRETunnelUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/magic_transit/test_ipsec_tunnels.py b/tests/api_resources/magic_transit/test_ipsec_tunnels.py index 0b528f25c67..c5b0736f9d9 100644 --- a/tests/api_resources/magic_transit/test_ipsec_tunnels.py +++ b/tests/api_resources/magic_transit/test_ipsec_tunnels.py @@ -9,14 +9,12 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.magic_transit import ( - IPSECTunnelGetResponse, - IPSECTunnelListResponse, - IPSECTunnelCreateResponse, - IPSECTunnelDeleteResponse, - IPSECTunnelUpdateResponse, - IPSECTunnelPSKGenerateResponse, -) +from cloudflare.types.magic_transit.ipsec_tunnel_get_response import IPSECTunnelGetResponse +from cloudflare.types.magic_transit.ipsec_tunnel_list_response import IPSECTunnelListResponse +from cloudflare.types.magic_transit.ipsec_tunnel_create_response import IPSECTunnelCreateResponse +from cloudflare.types.magic_transit.ipsec_tunnel_delete_response import IPSECTunnelDeleteResponse +from cloudflare.types.magic_transit.ipsec_tunnel_update_response import IPSECTunnelUpdateResponse +from cloudflare.types.magic_transit.ipsec_tunnel_psk_generate_response import IPSECTunnelPSKGenerateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/magic_transit/test_routes.py b/tests/api_resources/magic_transit/test_routes.py index 1278b9ccae5..f6d14e34638 100644 --- a/tests/api_resources/magic_transit/test_routes.py +++ b/tests/api_resources/magic_transit/test_routes.py @@ -9,14 +9,12 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.magic_transit import ( - RouteGetResponse, - RouteListResponse, - RouteEmptyResponse, - RouteCreateResponse, - RouteDeleteResponse, - RouteUpdateResponse, -) +from cloudflare.types.magic_transit.route_get_response import RouteGetResponse +from cloudflare.types.magic_transit.route_list_response import RouteListResponse +from cloudflare.types.magic_transit.route_empty_response import RouteEmptyResponse +from cloudflare.types.magic_transit.route_create_response import RouteCreateResponse +from cloudflare.types.magic_transit.route_delete_response import RouteDeleteResponse +from cloudflare.types.magic_transit.route_update_response import RouteUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/magic_transit/test_sites.py b/tests/api_resources/magic_transit/test_sites.py index caa3e57c277..95204348147 100644 --- a/tests/api_resources/magic_transit/test_sites.py +++ b/tests/api_resources/magic_transit/test_sites.py @@ -10,9 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.magic_transit import ( - Site, -) +from cloudflare.types.magic_transit.site import Site base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/mtls_certificates/test_associations.py b/tests/api_resources/mtls_certificates/test_associations.py index a253daa651a..68a4e567393 100644 --- a/tests/api_resources/mtls_certificates/test_associations.py +++ b/tests/api_resources/mtls_certificates/test_associations.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.mtls_certificates import AssociationGetResponse +from cloudflare.types.mtls_certificates.association_get_response import AssociationGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/origin_tls_client_auth/hostnames/test_certificates.py b/tests/api_resources/origin_tls_client_auth/hostnames/test_certificates.py index ff3cb79a4b9..70cc49a745d 100644 --- a/tests/api_resources/origin_tls_client_auth/hostnames/test_certificates.py +++ b/tests/api_resources/origin_tls_client_auth/hostnames/test_certificates.py @@ -10,12 +10,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.origin_tls_client_auth import AuthenticatedOriginPull -from cloudflare.types.origin_tls_client_auth.hostnames import ( - CertificateGetResponse, - CertificateCreateResponse, - CertificateDeleteResponse, -) +from cloudflare.types.origin_tls_client_auth.authenticated_origin_pull import AuthenticatedOriginPull +from cloudflare.types.origin_tls_client_auth.hostnames.certificate_get_response import CertificateGetResponse +from cloudflare.types.origin_tls_client_auth.hostnames.certificate_create_response import CertificateCreateResponse +from cloudflare.types.origin_tls_client_auth.hostnames.certificate_delete_response import CertificateDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/origin_tls_client_auth/test_hostnames.py b/tests/api_resources/origin_tls_client_auth/test_hostnames.py index a3247d84853..6576aedf513 100644 --- a/tests/api_resources/origin_tls_client_auth/test_hostnames.py +++ b/tests/api_resources/origin_tls_client_auth/test_hostnames.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.origin_tls_client_auth import ( - HostnameUpdateResponse, - AuthenticatedOriginPull, -) +from cloudflare.types.origin_tls_client_auth.hostname_update_response import HostnameUpdateResponse +from cloudflare.types.origin_tls_client_auth.authenticated_origin_pull import AuthenticatedOriginPull base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/origin_tls_client_auth/test_settings.py b/tests/api_resources/origin_tls_client_auth/test_settings.py index 009e48b2779..4c35bbd0427 100644 --- a/tests/api_resources/origin_tls_client_auth/test_settings.py +++ b/tests/api_resources/origin_tls_client_auth/test_settings.py @@ -9,7 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.origin_tls_client_auth import SettingGetResponse, SettingUpdateResponse +from cloudflare.types.origin_tls_client_auth.setting_get_response import SettingGetResponse +from cloudflare.types.origin_tls_client_auth.setting_update_response import SettingUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/page_shield/test_connections.py b/tests/api_resources/page_shield/test_connections.py index 77edfc01969..7af1088e528 100644 --- a/tests/api_resources/page_shield/test_connections.py +++ b/tests/api_resources/page_shield/test_connections.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.page_shield import Connection +from cloudflare.types.page_shield.connection import Connection base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/page_shield/test_policies.py b/tests/api_resources/page_shield/test_policies.py index 81f6297c0e0..c81f6dda008 100644 --- a/tests/api_resources/page_shield/test_policies.py +++ b/tests/api_resources/page_shield/test_policies.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.page_shield import Policy +from cloudflare.types.page_shield.policy import Policy base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/page_shield/test_scripts.py b/tests/api_resources/page_shield/test_scripts.py index 50e23e6340d..04693a1aa4c 100644 --- a/tests/api_resources/page_shield/test_scripts.py +++ b/tests/api_resources/page_shield/test_scripts.py @@ -10,7 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.page_shield import Script, ScriptGetResponse +from cloudflare.types.page_shield.script import Script +from cloudflare.types.page_shield.script_get_response import ScriptGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/pagerules/test_settings.py b/tests/api_resources/pagerules/test_settings.py index 983c7e2bd05..6e5c917c33a 100644 --- a/tests/api_resources/pagerules/test_settings.py +++ b/tests/api_resources/pagerules/test_settings.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.pagerules import SettingListResponse +from cloudflare.types.pagerules.setting_list_response import SettingListResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/pages/projects/deployments/history/test_logs.py b/tests/api_resources/pages/projects/deployments/history/test_logs.py index 7e59a77f9b2..229d9086dc6 100644 --- a/tests/api_resources/pages/projects/deployments/history/test_logs.py +++ b/tests/api_resources/pages/projects/deployments/history/test_logs.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.pages.projects.deployments.history import LogGetResponse +from cloudflare.types.pages.projects.deployments.history.log_get_response import LogGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/pages/projects/test_deployments.py b/tests/api_resources/pages/projects/test_deployments.py index 75764f1a1e4..028df3f39b9 100644 --- a/tests/api_resources/pages/projects/test_deployments.py +++ b/tests/api_resources/pages/projects/test_deployments.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.pages import Deployment +from cloudflare.types.pages.deployment import Deployment base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/pages/projects/test_domains.py b/tests/api_resources/pages/projects/test_domains.py index 5e2614a1a25..2d52464334a 100644 --- a/tests/api_resources/pages/projects/test_domains.py +++ b/tests/api_resources/pages/projects/test_domains.py @@ -10,11 +10,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.pages.projects import ( - DomainGetResponse, - DomainEditResponse, - DomainCreateResponse, -) +from cloudflare.types.pages.projects.domain_get_response import DomainGetResponse +from cloudflare.types.pages.projects.domain_edit_response import DomainEditResponse +from cloudflare.types.pages.projects.domain_create_response import DomainCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/pages/test_projects.py b/tests/api_resources/pages/test_projects.py index fa15dac6d2a..b21809e1159 100644 --- a/tests/api_resources/pages/test_projects.py +++ b/tests/api_resources/pages/test_projects.py @@ -10,12 +10,11 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.pages import ( - Project, - Deployment, - ProjectEditResponse, - ProjectCreateResponse, -) +from cloudflare.types.pages import Deployment +from cloudflare.types.pages.project import Project +from cloudflare.types.pages.deployment import Deployment +from cloudflare.types.pages.project_edit_response import ProjectEditResponse +from cloudflare.types.pages.project_create_response import ProjectCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/pcaps/test_ownership.py b/tests/api_resources/pcaps/test_ownership.py index d3a4f2fad81..ea09f6d7e9b 100644 --- a/tests/api_resources/pcaps/test_ownership.py +++ b/tests/api_resources/pcaps/test_ownership.py @@ -9,7 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.pcaps import Ownership, OwnershipGetResponse +from cloudflare.types.pcaps.ownership import Ownership +from cloudflare.types.pcaps.ownership_get_response import OwnershipGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/queues/test_consumers.py b/tests/api_resources/queues/test_consumers.py index 4cd23d21213..34cfa593ec9 100644 --- a/tests/api_resources/queues/test_consumers.py +++ b/tests/api_resources/queues/test_consumers.py @@ -9,12 +9,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.queues import ( - ConsumerGetResponse, - ConsumerCreateResponse, - ConsumerDeleteResponse, - ConsumerUpdateResponse, -) +from cloudflare.types.queues.consumer_get_response import ConsumerGetResponse +from cloudflare.types.queues.consumer_create_response import ConsumerCreateResponse +from cloudflare.types.queues.consumer_delete_response import ConsumerDeleteResponse +from cloudflare.types.queues.consumer_update_response import ConsumerUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/queues/test_messages.py b/tests/api_resources/queues/test_messages.py index 1e24941e1b8..e9d079c14c6 100644 --- a/tests/api_resources/queues/test_messages.py +++ b/tests/api_resources/queues/test_messages.py @@ -9,7 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.queues import MessageAckResponse, MessagePullResponse +from cloudflare.types.queues.message_ack_response import MessageAckResponse +from cloudflare.types.queues.message_pull_response import MessagePullResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/r2/test_buckets.py b/tests/api_resources/r2/test_buckets.py index 157f4be3fe6..86527042892 100644 --- a/tests/api_resources/r2/test_buckets.py +++ b/tests/api_resources/r2/test_buckets.py @@ -9,8 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.r2 import Bucket from cloudflare.pagination import SyncCursorPagination, AsyncCursorPagination +from cloudflare.types.r2.bucket import Bucket base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/r2/test_sippy.py b/tests/api_resources/r2/test_sippy.py index 364859aae67..28ea8a332f9 100644 --- a/tests/api_resources/r2/test_sippy.py +++ b/tests/api_resources/r2/test_sippy.py @@ -9,7 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.r2 import Sippy, SippyDeleteResponse +from cloudflare.types.r2.sippy import Sippy +from cloudflare.types.r2.sippy_delete_response import SippyDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/annotations/test_outages.py b/tests/api_resources/radar/annotations/test_outages.py index 98c8d58fec8..6e01d1086b1 100644 --- a/tests/api_resources/radar/annotations/test_outages.py +++ b/tests/api_resources/radar/annotations/test_outages.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.annotations import ( - OutageGetResponse, - OutageLocationsResponse, -) +from cloudflare.types.radar.annotations.outage_get_response import OutageGetResponse +from cloudflare.types.radar.annotations.outage_locations_response import OutageLocationsResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/as112/test_summary.py b/tests/api_resources/radar/as112/test_summary.py index 1f6f7128b01..0f5c33d4dda 100644 --- a/tests/api_resources/radar/as112/test_summary.py +++ b/tests/api_resources/radar/as112/test_summary.py @@ -10,14 +10,12 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.as112 import ( - SummaryEdnsResponse, - SummaryDNSSECResponse, - SummaryProtocolResponse, - SummaryIPVersionResponse, - SummaryQueryTypeResponse, - SummaryResponseCodesResponse, -) +from cloudflare.types.radar.as112.summary_edns_response import SummaryEdnsResponse +from cloudflare.types.radar.as112.summary_dnssec_response import SummaryDNSSECResponse +from cloudflare.types.radar.as112.summary_protocol_response import SummaryProtocolResponse +from cloudflare.types.radar.as112.summary_ip_version_response import SummaryIPVersionResponse +from cloudflare.types.radar.as112.summary_query_type_response import SummaryQueryTypeResponse +from cloudflare.types.radar.as112.summary_response_codes_response import SummaryResponseCodesResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/as112/test_timeseries_groups.py b/tests/api_resources/radar/as112/test_timeseries_groups.py index ed291ceed6b..1d58cb77806 100644 --- a/tests/api_resources/radar/as112/test_timeseries_groups.py +++ b/tests/api_resources/radar/as112/test_timeseries_groups.py @@ -10,14 +10,12 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.as112 import ( - TimeseriesGroupEdnsResponse, - TimeseriesGroupDNSSECResponse, - TimeseriesGroupProtocolResponse, - TimeseriesGroupIPVersionResponse, - TimeseriesGroupQueryTypeResponse, - TimeseriesGroupResponseCodesResponse, -) +from cloudflare.types.radar.as112.timeseries_group_edns_response import TimeseriesGroupEdnsResponse +from cloudflare.types.radar.as112.timeseries_group_dnssec_response import TimeseriesGroupDNSSECResponse +from cloudflare.types.radar.as112.timeseries_group_protocol_response import TimeseriesGroupProtocolResponse +from cloudflare.types.radar.as112.timeseries_group_ip_version_response import TimeseriesGroupIPVersionResponse +from cloudflare.types.radar.as112.timeseries_group_query_type_response import TimeseriesGroupQueryTypeResponse +from cloudflare.types.radar.as112.timeseries_group_response_codes_response import TimeseriesGroupResponseCodesResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/as112/test_top.py b/tests/api_resources/radar/as112/test_top.py index 9dcda9b638d..8b96e7e9fbe 100644 --- a/tests/api_resources/radar/as112/test_top.py +++ b/tests/api_resources/radar/as112/test_top.py @@ -10,12 +10,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.as112 import ( - TopEdnsResponse, - TopDNSSECResponse, - TopIPVersionResponse, - TopLocationsResponse, -) +from cloudflare.types.radar.as112.top_edns_response import TopEdnsResponse +from cloudflare.types.radar.as112.top_dnssec_response import TopDNSSECResponse +from cloudflare.types.radar.as112.top_locations_response import TopLocationsResponse +from cloudflare.types.radar.as112.top_ip_version_response import TopIPVersionResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/attacks/layer3/test_summary.py b/tests/api_resources/radar/attacks/layer3/test_summary.py index fa77a34344f..82a2922ffb2 100644 --- a/tests/api_resources/radar/attacks/layer3/test_summary.py +++ b/tests/api_resources/radar/attacks/layer3/test_summary.py @@ -10,14 +10,12 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.attacks.layer3 import ( - SummaryGetResponse, - SummaryVectorResponse, - SummaryBitrateResponse, - SummaryDurationResponse, - SummaryProtocolResponse, - SummaryIPVersionResponse, -) +from cloudflare.types.radar.attacks.layer3.summary_get_response import SummaryGetResponse +from cloudflare.types.radar.attacks.layer3.summary_vector_response import SummaryVectorResponse +from cloudflare.types.radar.attacks.layer3.summary_bitrate_response import SummaryBitrateResponse +from cloudflare.types.radar.attacks.layer3.summary_duration_response import SummaryDurationResponse +from cloudflare.types.radar.attacks.layer3.summary_protocol_response import SummaryProtocolResponse +from cloudflare.types.radar.attacks.layer3.summary_ip_version_response import SummaryIPVersionResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/attacks/layer3/test_timeseries_groups.py b/tests/api_resources/radar/attacks/layer3/test_timeseries_groups.py index 67738ff175e..02d5501344c 100644 --- a/tests/api_resources/radar/attacks/layer3/test_timeseries_groups.py +++ b/tests/api_resources/radar/attacks/layer3/test_timeseries_groups.py @@ -10,16 +10,14 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.attacks.layer3 import ( - TimeseriesGroupGetResponse, - TimeseriesGroupVectorResponse, - TimeseriesGroupBitrateResponse, - TimeseriesGroupDurationResponse, - TimeseriesGroupIndustryResponse, - TimeseriesGroupProtocolResponse, - TimeseriesGroupVerticalResponse, - TimeseriesGroupIPVersionResponse, -) +from cloudflare.types.radar.attacks.layer3.timeseries_group_get_response import TimeseriesGroupGetResponse +from cloudflare.types.radar.attacks.layer3.timeseries_group_vector_response import TimeseriesGroupVectorResponse +from cloudflare.types.radar.attacks.layer3.timeseries_group_bitrate_response import TimeseriesGroupBitrateResponse +from cloudflare.types.radar.attacks.layer3.timeseries_group_duration_response import TimeseriesGroupDurationResponse +from cloudflare.types.radar.attacks.layer3.timeseries_group_industry_response import TimeseriesGroupIndustryResponse +from cloudflare.types.radar.attacks.layer3.timeseries_group_protocol_response import TimeseriesGroupProtocolResponse +from cloudflare.types.radar.attacks.layer3.timeseries_group_vertical_response import TimeseriesGroupVerticalResponse +from cloudflare.types.radar.attacks.layer3.timeseries_group_ip_version_response import TimeseriesGroupIPVersionResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/attacks/layer3/test_top.py b/tests/api_resources/radar/attacks/layer3/test_top.py index d48011bdd67..d1af74044c4 100644 --- a/tests/api_resources/radar/attacks/layer3/test_top.py +++ b/tests/api_resources/radar/attacks/layer3/test_top.py @@ -10,11 +10,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.attacks.layer3 import ( - TopAttacksResponse, - TopIndustryResponse, - TopVerticalResponse, -) +from cloudflare.types.radar.attacks.layer3.top_attacks_response import TopAttacksResponse +from cloudflare.types.radar.attacks.layer3.top_industry_response import TopIndustryResponse +from cloudflare.types.radar.attacks.layer3.top_vertical_response import TopVerticalResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/attacks/layer3/top/test_locations.py b/tests/api_resources/radar/attacks/layer3/top/test_locations.py index 194c19f4bcd..0b3c0f450b9 100644 --- a/tests/api_resources/radar/attacks/layer3/top/test_locations.py +++ b/tests/api_resources/radar/attacks/layer3/top/test_locations.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.attacks.layer3.top import ( - LocationOriginResponse, - LocationTargetResponse, -) +from cloudflare.types.radar.attacks.layer3.top.location_origin_response import LocationOriginResponse +from cloudflare.types.radar.attacks.layer3.top.location_target_response import LocationTargetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/attacks/layer7/test_summary.py b/tests/api_resources/radar/attacks/layer7/test_summary.py index 387fa63e663..04f966d65f7 100644 --- a/tests/api_resources/radar/attacks/layer7/test_summary.py +++ b/tests/api_resources/radar/attacks/layer7/test_summary.py @@ -10,14 +10,12 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.attacks.layer7 import ( - SummaryGetResponse, - SummaryIPVersionResponse, - SummaryHTTPMethodResponse, - SummaryHTTPVersionResponse, - SummaryManagedRulesResponse, - SummaryMitigationProductResponse, -) +from cloudflare.types.radar.attacks.layer7.summary_get_response import SummaryGetResponse +from cloudflare.types.radar.attacks.layer7.summary_ip_version_response import SummaryIPVersionResponse +from cloudflare.types.radar.attacks.layer7.summary_http_method_response import SummaryHTTPMethodResponse +from cloudflare.types.radar.attacks.layer7.summary_http_version_response import SummaryHTTPVersionResponse +from cloudflare.types.radar.attacks.layer7.summary_managed_rules_response import SummaryManagedRulesResponse +from cloudflare.types.radar.attacks.layer7.summary_mitigation_product_response import SummaryMitigationProductResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/attacks/layer7/test_timeseries_groups.py b/tests/api_resources/radar/attacks/layer7/test_timeseries_groups.py index e019a3d76fd..6ddbc689255 100644 --- a/tests/api_resources/radar/attacks/layer7/test_timeseries_groups.py +++ b/tests/api_resources/radar/attacks/layer7/test_timeseries_groups.py @@ -10,14 +10,20 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.attacks.layer7 import ( - TimeseriesGroupGetResponse, - TimeseriesGroupIndustryResponse, - TimeseriesGroupVerticalResponse, - TimeseriesGroupIPVersionResponse, +from cloudflare.types.radar.attacks.layer7.timeseries_group_get_response import TimeseriesGroupGetResponse +from cloudflare.types.radar.attacks.layer7.timeseries_group_industry_response import TimeseriesGroupIndustryResponse +from cloudflare.types.radar.attacks.layer7.timeseries_group_vertical_response import TimeseriesGroupVerticalResponse +from cloudflare.types.radar.attacks.layer7.timeseries_group_ip_version_response import TimeseriesGroupIPVersionResponse +from cloudflare.types.radar.attacks.layer7.timeseries_group_http_method_response import ( TimeseriesGroupHTTPMethodResponse, +) +from cloudflare.types.radar.attacks.layer7.timeseries_group_http_version_response import ( TimeseriesGroupHTTPVersionResponse, +) +from cloudflare.types.radar.attacks.layer7.timeseries_group_managed_rules_response import ( TimeseriesGroupManagedRulesResponse, +) +from cloudflare.types.radar.attacks.layer7.timeseries_group_mitigation_product_response import ( TimeseriesGroupMitigationProductResponse, ) diff --git a/tests/api_resources/radar/attacks/layer7/test_top.py b/tests/api_resources/radar/attacks/layer7/test_top.py index 6f0a9adb0a9..e42d7e3911e 100644 --- a/tests/api_resources/radar/attacks/layer7/test_top.py +++ b/tests/api_resources/radar/attacks/layer7/test_top.py @@ -10,11 +10,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.attacks.layer7 import ( - TopAttacksResponse, - TopIndustryResponse, - TopVerticalResponse, -) +from cloudflare.types.radar.attacks.layer7.top_attacks_response import TopAttacksResponse +from cloudflare.types.radar.attacks.layer7.top_industry_response import TopIndustryResponse +from cloudflare.types.radar.attacks.layer7.top_vertical_response import TopVerticalResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/attacks/layer7/top/test_ases.py b/tests/api_resources/radar/attacks/layer7/top/test_ases.py index cf12547e615..837a20eb43a 100644 --- a/tests/api_resources/radar/attacks/layer7/top/test_ases.py +++ b/tests/api_resources/radar/attacks/layer7/top/test_ases.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.attacks.layer7.top import AseOriginResponse +from cloudflare.types.radar.attacks.layer7.top.ase_origin_response import AseOriginResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/attacks/layer7/top/test_locations.py b/tests/api_resources/radar/attacks/layer7/top/test_locations.py index 0752c790d23..8fc1f872afe 100644 --- a/tests/api_resources/radar/attacks/layer7/top/test_locations.py +++ b/tests/api_resources/radar/attacks/layer7/top/test_locations.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.attacks.layer7.top import ( - LocationOriginResponse, - LocationTargetResponse, -) +from cloudflare.types.radar.attacks.layer7.top.location_origin_response import LocationOriginResponse +from cloudflare.types.radar.attacks.layer7.top.location_target_response import LocationTargetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/attacks/test_layer3.py b/tests/api_resources/radar/attacks/test_layer3.py index cc21487946f..046f8f55624 100644 --- a/tests/api_resources/radar/attacks/test_layer3.py +++ b/tests/api_resources/radar/attacks/test_layer3.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.attacks import Layer3TimeseriesResponse +from cloudflare.types.radar.attacks.layer3_timeseries_response import Layer3TimeseriesResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/attacks/test_layer7.py b/tests/api_resources/radar/attacks/test_layer7.py index 45528ada5ac..8c9bb815231 100644 --- a/tests/api_resources/radar/attacks/test_layer7.py +++ b/tests/api_resources/radar/attacks/test_layer7.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.attacks import Layer7TimeseriesResponse +from cloudflare.types.radar.attacks.layer7_timeseries_response import Layer7TimeseriesResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/bgp/hijacks/test_events.py b/tests/api_resources/radar/bgp/hijacks/test_events.py index e12b3caa09f..ff34479ed22 100644 --- a/tests/api_resources/radar/bgp/hijacks/test_events.py +++ b/tests/api_resources/radar/bgp/hijacks/test_events.py @@ -11,7 +11,7 @@ from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime from cloudflare.pagination import SyncV4PagePagination, AsyncV4PagePagination -from cloudflare.types.radar.bgp.hijacks import EventListResponse +from cloudflare.types.radar.bgp.hijacks.event_list_response import EventListResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/bgp/leaks/test_events.py b/tests/api_resources/radar/bgp/leaks/test_events.py index a8eef2dfaf3..5a98a3b965f 100644 --- a/tests/api_resources/radar/bgp/leaks/test_events.py +++ b/tests/api_resources/radar/bgp/leaks/test_events.py @@ -11,7 +11,7 @@ from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime from cloudflare.pagination import SyncV4PagePagination, AsyncV4PagePagination -from cloudflare.types.radar.bgp.leaks import EventListResponse +from cloudflare.types.radar.bgp.leaks.event_list_response import EventListResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/bgp/test_routes.py b/tests/api_resources/radar/bgp/test_routes.py index 9b9ca69370b..73f6f629fe7 100644 --- a/tests/api_resources/radar/bgp/test_routes.py +++ b/tests/api_resources/radar/bgp/test_routes.py @@ -10,12 +10,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.bgp import ( - RouteMoasResponse, - RouteStatsResponse, - RoutePfx2asResponse, - RouteTimeseriesResponse, -) +from cloudflare.types.radar.bgp.route_moas_response import RouteMoasResponse +from cloudflare.types.radar.bgp.route_stats_response import RouteStatsResponse +from cloudflare.types.radar.bgp.route_pfx2as_response import RoutePfx2asResponse +from cloudflare.types.radar.bgp.route_timeseries_response import RouteTimeseriesResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/bgp/test_top.py b/tests/api_resources/radar/bgp/test_top.py index 7f8f9d2cccd..8a7e33da87e 100644 --- a/tests/api_resources/radar/bgp/test_top.py +++ b/tests/api_resources/radar/bgp/test_top.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.bgp import TopPrefixesResponse +from cloudflare.types.radar.bgp.top_prefixes_response import TopPrefixesResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/bgp/top/test_ases.py b/tests/api_resources/radar/bgp/top/test_ases.py index 515a06046a6..3ed5a561ce7 100644 --- a/tests/api_resources/radar/bgp/top/test_ases.py +++ b/tests/api_resources/radar/bgp/top/test_ases.py @@ -10,7 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.bgp.top import AseGetResponse, AsePrefixesResponse +from cloudflare.types.radar.bgp.top.ase_get_response import AseGetResponse +from cloudflare.types.radar.bgp.top.ase_prefixes_response import AsePrefixesResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/dns/test_top.py b/tests/api_resources/radar/dns/test_top.py index e9e4494a4b1..ebdc9f1f3c5 100644 --- a/tests/api_resources/radar/dns/test_top.py +++ b/tests/api_resources/radar/dns/test_top.py @@ -10,7 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.dns import TopAsesResponse, TopLocationsResponse +from cloudflare.types.radar.dns.top_ases_response import TopAsesResponse +from cloudflare.types.radar.dns.top_locations_response import TopLocationsResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/email/routing/test_summary.py b/tests/api_resources/radar/email/routing/test_summary.py index f44308cbcb4..f308e6ebe35 100644 --- a/tests/api_resources/radar/email/routing/test_summary.py +++ b/tests/api_resources/radar/email/routing/test_summary.py @@ -10,14 +10,12 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.email.routing import ( - SummaryARCResponse, - SummarySPFResponse, - SummaryDKIMResponse, - SummaryDMARCResponse, - SummaryEncryptedResponse, - SummaryIPVersionResponse, -) +from cloudflare.types.radar.email.routing.summary_arc_response import SummaryARCResponse +from cloudflare.types.radar.email.routing.summary_spf_response import SummarySPFResponse +from cloudflare.types.radar.email.routing.summary_dkim_response import SummaryDKIMResponse +from cloudflare.types.radar.email.routing.summary_dmarc_response import SummaryDMARCResponse +from cloudflare.types.radar.email.routing.summary_encrypted_response import SummaryEncryptedResponse +from cloudflare.types.radar.email.routing.summary_ip_version_response import SummaryIPVersionResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/email/routing/test_timeseries_groups.py b/tests/api_resources/radar/email/routing/test_timeseries_groups.py index cc4f249e4c3..87384aa42a4 100644 --- a/tests/api_resources/radar/email/routing/test_timeseries_groups.py +++ b/tests/api_resources/radar/email/routing/test_timeseries_groups.py @@ -10,14 +10,12 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.email.routing import ( - TimeseriesGroupARCResponse, - TimeseriesGroupSPFResponse, - TimeseriesGroupDKIMResponse, - TimeseriesGroupDMARCResponse, - TimeseriesGroupEncryptedResponse, - TimeseriesGroupIPVersionResponse, -) +from cloudflare.types.radar.email.routing.timeseries_group_arc_response import TimeseriesGroupARCResponse +from cloudflare.types.radar.email.routing.timeseries_group_spf_response import TimeseriesGroupSPFResponse +from cloudflare.types.radar.email.routing.timeseries_group_dkim_response import TimeseriesGroupDKIMResponse +from cloudflare.types.radar.email.routing.timeseries_group_dmarc_response import TimeseriesGroupDMARCResponse +from cloudflare.types.radar.email.routing.timeseries_group_encrypted_response import TimeseriesGroupEncryptedResponse +from cloudflare.types.radar.email.routing.timeseries_group_ip_version_response import TimeseriesGroupIPVersionResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/email/security/test_summary.py b/tests/api_resources/radar/email/security/test_summary.py index e3df2f5670c..184499e541f 100644 --- a/tests/api_resources/radar/email/security/test_summary.py +++ b/tests/api_resources/radar/email/security/test_summary.py @@ -10,17 +10,15 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.email.security import ( - SummaryARCResponse, - SummarySPFResponse, - SummaryDKIMResponse, - SummarySpamResponse, - SummaryDMARCResponse, - SummarySpoofResponse, - SummaryMaliciousResponse, - SummaryTLSVersionResponse, - SummaryThreatCategoryResponse, -) +from cloudflare.types.radar.email.security.summary_arc_response import SummaryARCResponse +from cloudflare.types.radar.email.security.summary_spf_response import SummarySPFResponse +from cloudflare.types.radar.email.security.summary_dkim_response import SummaryDKIMResponse +from cloudflare.types.radar.email.security.summary_spam_response import SummarySpamResponse +from cloudflare.types.radar.email.security.summary_dmarc_response import SummaryDMARCResponse +from cloudflare.types.radar.email.security.summary_spoof_response import SummarySpoofResponse +from cloudflare.types.radar.email.security.summary_malicious_response import SummaryMaliciousResponse +from cloudflare.types.radar.email.security.summary_tls_version_response import SummaryTLSVersionResponse +from cloudflare.types.radar.email.security.summary_threat_category_response import SummaryThreatCategoryResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/email/security/test_timeseries_groups.py b/tests/api_resources/radar/email/security/test_timeseries_groups.py index 4af4404daa9..ddb4b23599e 100644 --- a/tests/api_resources/radar/email/security/test_timeseries_groups.py +++ b/tests/api_resources/radar/email/security/test_timeseries_groups.py @@ -10,15 +10,17 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.email.security import ( - TimeseriesGroupARCResponse, - TimeseriesGroupSPFResponse, - TimeseriesGroupDKIMResponse, - TimeseriesGroupSpamResponse, - TimeseriesGroupDMARCResponse, - TimeseriesGroupSpoofResponse, - TimeseriesGroupMaliciousResponse, +from cloudflare.types.radar.email.security.timeseries_group_arc_response import TimeseriesGroupARCResponse +from cloudflare.types.radar.email.security.timeseries_group_spf_response import TimeseriesGroupSPFResponse +from cloudflare.types.radar.email.security.timeseries_group_dkim_response import TimeseriesGroupDKIMResponse +from cloudflare.types.radar.email.security.timeseries_group_spam_response import TimeseriesGroupSpamResponse +from cloudflare.types.radar.email.security.timeseries_group_dmarc_response import TimeseriesGroupDMARCResponse +from cloudflare.types.radar.email.security.timeseries_group_spoof_response import TimeseriesGroupSpoofResponse +from cloudflare.types.radar.email.security.timeseries_group_malicious_response import TimeseriesGroupMaliciousResponse +from cloudflare.types.radar.email.security.timeseries_group_tls_version_response import ( TimeseriesGroupTLSVersionResponse, +) +from cloudflare.types.radar.email.security.timeseries_group_threat_category_response import ( TimeseriesGroupThreatCategoryResponse, ) diff --git a/tests/api_resources/radar/email/security/top/test_tlds.py b/tests/api_resources/radar/email/security/top/test_tlds.py index 218f134cedf..def47cffc7b 100644 --- a/tests/api_resources/radar/email/security/top/test_tlds.py +++ b/tests/api_resources/radar/email/security/top/test_tlds.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.email.security.top import TldGetResponse +from cloudflare.types.radar.email.security.top.tld_get_response import TldGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/email/security/top/tlds/test_malicious.py b/tests/api_resources/radar/email/security/top/tlds/test_malicious.py index 22bf1dfcb8f..705b7b82018 100644 --- a/tests/api_resources/radar/email/security/top/tlds/test_malicious.py +++ b/tests/api_resources/radar/email/security/top/tlds/test_malicious.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.email.security.top.tlds import MaliciousGetResponse +from cloudflare.types.radar.email.security.top.tlds.malicious_get_response import MaliciousGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/email/security/top/tlds/test_spam.py b/tests/api_resources/radar/email/security/top/tlds/test_spam.py index 62b1b969239..0a98e2f14ed 100644 --- a/tests/api_resources/radar/email/security/top/tlds/test_spam.py +++ b/tests/api_resources/radar/email/security/top/tlds/test_spam.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.email.security.top.tlds import SpamGetResponse +from cloudflare.types.radar.email.security.top.tlds.spam_get_response import SpamGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/email/security/top/tlds/test_spoof.py b/tests/api_resources/radar/email/security/top/tlds/test_spoof.py index 185a4306397..15a09dc7c6b 100644 --- a/tests/api_resources/radar/email/security/top/tlds/test_spoof.py +++ b/tests/api_resources/radar/email/security/top/tlds/test_spoof.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.email.security.top.tlds import SpoofGetResponse +from cloudflare.types.radar.email.security.top.tlds.spoof_get_response import SpoofGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/entities/test_asns.py b/tests/api_resources/radar/entities/test_asns.py index 8273d3fc87e..958e4fb3ea6 100644 --- a/tests/api_resources/radar/entities/test_asns.py +++ b/tests/api_resources/radar/entities/test_asns.py @@ -9,12 +9,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.radar.entities import ( - ASNIPResponse, - ASNGetResponse, - ASNRelResponse, - ASNListResponse, -) +from cloudflare.types.radar.entities.asn_ip_response import ASNIPResponse +from cloudflare.types.radar.entities.asn_get_response import ASNGetResponse +from cloudflare.types.radar.entities.asn_rel_response import ASNRelResponse +from cloudflare.types.radar.entities.asn_list_response import ASNListResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/entities/test_locations.py b/tests/api_resources/radar/entities/test_locations.py index 59e8a6ff915..36ae6224790 100644 --- a/tests/api_resources/radar/entities/test_locations.py +++ b/tests/api_resources/radar/entities/test_locations.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.radar.entities import ( - LocationGetResponse, - LocationListResponse, -) +from cloudflare.types.radar.entities.location_get_response import LocationGetResponse +from cloudflare.types.radar.entities.location_list_response import LocationListResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/http/ases/test_bot_class.py b/tests/api_resources/radar/http/ases/test_bot_class.py index 177775b9dc4..a804ae8a959 100644 --- a/tests/api_resources/radar/http/ases/test_bot_class.py +++ b/tests/api_resources/radar/http/ases/test_bot_class.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.http.ases import BotClassGetResponse +from cloudflare.types.radar.http.ases.bot_class_get_response import BotClassGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/http/ases/test_device_type.py b/tests/api_resources/radar/http/ases/test_device_type.py index 15dde782973..391e750c55e 100644 --- a/tests/api_resources/radar/http/ases/test_device_type.py +++ b/tests/api_resources/radar/http/ases/test_device_type.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.http.ases import DeviceTypeGetResponse +from cloudflare.types.radar.http.ases.device_type_get_response import DeviceTypeGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/http/ases/test_http_method.py b/tests/api_resources/radar/http/ases/test_http_method.py index 4ad2abaf200..03efb0c4ff9 100644 --- a/tests/api_resources/radar/http/ases/test_http_method.py +++ b/tests/api_resources/radar/http/ases/test_http_method.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.http.ases import HTTPMethodGetResponse +from cloudflare.types.radar.http.ases.http_method_get_response import HTTPMethodGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/http/ases/test_http_protocol.py b/tests/api_resources/radar/http/ases/test_http_protocol.py index 91b9272418a..16d31c48ba6 100644 --- a/tests/api_resources/radar/http/ases/test_http_protocol.py +++ b/tests/api_resources/radar/http/ases/test_http_protocol.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.http.ases import HTTPProtocolGetResponse +from cloudflare.types.radar.http.ases.http_protocol_get_response import HTTPProtocolGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/http/ases/test_ip_version.py b/tests/api_resources/radar/http/ases/test_ip_version.py index 6926a2d80a9..395fc8f4668 100644 --- a/tests/api_resources/radar/http/ases/test_ip_version.py +++ b/tests/api_resources/radar/http/ases/test_ip_version.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.http.ases import IPVersionGetResponse +from cloudflare.types.radar.http.ases.ip_version_get_response import IPVersionGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/http/ases/test_os.py b/tests/api_resources/radar/http/ases/test_os.py index aee0b72ed62..57df70a027a 100644 --- a/tests/api_resources/radar/http/ases/test_os.py +++ b/tests/api_resources/radar/http/ases/test_os.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.http.ases import OSGetResponse +from cloudflare.types.radar.http.ases.os_get_response import OSGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/http/ases/test_tls_version.py b/tests/api_resources/radar/http/ases/test_tls_version.py index 1d6e229862d..18b2a467775 100644 --- a/tests/api_resources/radar/http/ases/test_tls_version.py +++ b/tests/api_resources/radar/http/ases/test_tls_version.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.http.ases import TLSVersionGetResponse +from cloudflare.types.radar.http.ases.tls_version_get_response import TLSVersionGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/http/locations/test_bot_class.py b/tests/api_resources/radar/http/locations/test_bot_class.py index 2494f445a5b..2e0daafb45a 100644 --- a/tests/api_resources/radar/http/locations/test_bot_class.py +++ b/tests/api_resources/radar/http/locations/test_bot_class.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.http.locations import BotClassGetResponse +from cloudflare.types.radar.http.locations.bot_class_get_response import BotClassGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/http/locations/test_device_type.py b/tests/api_resources/radar/http/locations/test_device_type.py index 30431de0cd8..412200f90b4 100644 --- a/tests/api_resources/radar/http/locations/test_device_type.py +++ b/tests/api_resources/radar/http/locations/test_device_type.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.http.locations import DeviceTypeGetResponse +from cloudflare.types.radar.http.locations.device_type_get_response import DeviceTypeGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/http/locations/test_http_method.py b/tests/api_resources/radar/http/locations/test_http_method.py index 6a78bd7867a..c657fceb244 100644 --- a/tests/api_resources/radar/http/locations/test_http_method.py +++ b/tests/api_resources/radar/http/locations/test_http_method.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.http.locations import HTTPMethodGetResponse +from cloudflare.types.radar.http.locations.http_method_get_response import HTTPMethodGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/http/locations/test_http_protocol.py b/tests/api_resources/radar/http/locations/test_http_protocol.py index 6dbb5bf0b0a..268a2cdfc18 100644 --- a/tests/api_resources/radar/http/locations/test_http_protocol.py +++ b/tests/api_resources/radar/http/locations/test_http_protocol.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.http.locations import HTTPProtocolGetResponse +from cloudflare.types.radar.http.locations.http_protocol_get_response import HTTPProtocolGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/http/locations/test_ip_version.py b/tests/api_resources/radar/http/locations/test_ip_version.py index 0a01d8af6df..19995d31358 100644 --- a/tests/api_resources/radar/http/locations/test_ip_version.py +++ b/tests/api_resources/radar/http/locations/test_ip_version.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.http.locations import IPVersionGetResponse +from cloudflare.types.radar.http.locations.ip_version_get_response import IPVersionGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/http/locations/test_os.py b/tests/api_resources/radar/http/locations/test_os.py index a2975b8b9a3..2b42985d9f1 100644 --- a/tests/api_resources/radar/http/locations/test_os.py +++ b/tests/api_resources/radar/http/locations/test_os.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.http.locations import OSGetResponse +from cloudflare.types.radar.http.locations.os_get_response import OSGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/http/locations/test_tls_version.py b/tests/api_resources/radar/http/locations/test_tls_version.py index e504f1110c1..535fc2b26d0 100644 --- a/tests/api_resources/radar/http/locations/test_tls_version.py +++ b/tests/api_resources/radar/http/locations/test_tls_version.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.http.locations import TLSVersionGetResponse +from cloudflare.types.radar.http.locations.tls_version_get_response import TLSVersionGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/http/test_ases.py b/tests/api_resources/radar/http/test_ases.py index 650376b1d3d..51b99a48a50 100644 --- a/tests/api_resources/radar/http/test_ases.py +++ b/tests/api_resources/radar/http/test_ases.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.http import AseGetResponse +from cloudflare.types.radar.http.ase_get_response import AseGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/http/test_locations.py b/tests/api_resources/radar/http/test_locations.py index f0dd6fbeaa7..32c696738f8 100644 --- a/tests/api_resources/radar/http/test_locations.py +++ b/tests/api_resources/radar/http/test_locations.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.http import LocationGetResponse +from cloudflare.types.radar.http.location_get_response import LocationGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/http/test_summary.py b/tests/api_resources/radar/http/test_summary.py index 3b06744b0a9..ff51e8f27a1 100644 --- a/tests/api_resources/radar/http/test_summary.py +++ b/tests/api_resources/radar/http/test_summary.py @@ -10,15 +10,13 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.http import ( - SummaryOSResponse, - SummaryBotClassResponse, - SummaryIPVersionResponse, - SummaryDeviceTypeResponse, - SummaryTLSVersionResponse, - SummaryHTTPVersionResponse, - SummaryHTTPProtocolResponse, -) +from cloudflare.types.radar.http.summary_os_response import SummaryOSResponse +from cloudflare.types.radar.http.summary_bot_class_response import SummaryBotClassResponse +from cloudflare.types.radar.http.summary_ip_version_response import SummaryIPVersionResponse +from cloudflare.types.radar.http.summary_device_type_response import SummaryDeviceTypeResponse +from cloudflare.types.radar.http.summary_tls_version_response import SummaryTLSVersionResponse +from cloudflare.types.radar.http.summary_http_version_response import SummaryHTTPVersionResponse +from cloudflare.types.radar.http.summary_http_protocol_response import SummaryHTTPProtocolResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/http/test_timeseries_groups.py b/tests/api_resources/radar/http/test_timeseries_groups.py index cb362d3ff23..eeb307b56ec 100644 --- a/tests/api_resources/radar/http/test_timeseries_groups.py +++ b/tests/api_resources/radar/http/test_timeseries_groups.py @@ -10,17 +10,15 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.http import ( - TimeseriesGroupOSResponse, - TimeseriesGroupBrowserResponse, - TimeseriesGroupBotClassResponse, - TimeseriesGroupIPVersionResponse, - TimeseriesGroupDeviceTypeResponse, - TimeseriesGroupTLSVersionResponse, - TimeseriesGroupHTTPVersionResponse, - TimeseriesGroupHTTPProtocolResponse, - TimeseriesGroupBrowserFamilyResponse, -) +from cloudflare.types.radar.http.timeseries_group_os_response import TimeseriesGroupOSResponse +from cloudflare.types.radar.http.timeseries_group_browser_response import TimeseriesGroupBrowserResponse +from cloudflare.types.radar.http.timeseries_group_bot_class_response import TimeseriesGroupBotClassResponse +from cloudflare.types.radar.http.timeseries_group_ip_version_response import TimeseriesGroupIPVersionResponse +from cloudflare.types.radar.http.timeseries_group_device_type_response import TimeseriesGroupDeviceTypeResponse +from cloudflare.types.radar.http.timeseries_group_tls_version_response import TimeseriesGroupTLSVersionResponse +from cloudflare.types.radar.http.timeseries_group_http_version_response import TimeseriesGroupHTTPVersionResponse +from cloudflare.types.radar.http.timeseries_group_http_protocol_response import TimeseriesGroupHTTPProtocolResponse +from cloudflare.types.radar.http.timeseries_group_browser_family_response import TimeseriesGroupBrowserFamilyResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/http/test_top.py b/tests/api_resources/radar/http/test_top.py index 6f5d3213d99..3b356cc5326 100644 --- a/tests/api_resources/radar/http/test_top.py +++ b/tests/api_resources/radar/http/test_top.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.http import ( - TopBrowsersResponse, - TopBrowserFamiliesResponse, -) +from cloudflare.types.radar.http.top_browsers_response import TopBrowsersResponse +from cloudflare.types.radar.http.top_browser_families_response import TopBrowserFamiliesResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/netflows/test_top.py b/tests/api_resources/radar/netflows/test_top.py index 8535abc7465..a0476609222 100644 --- a/tests/api_resources/radar/netflows/test_top.py +++ b/tests/api_resources/radar/netflows/test_top.py @@ -10,7 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.netflows import TopAsesResponse, TopLocationsResponse +from cloudflare.types.radar.netflows.top_ases_response import TopAsesResponse +from cloudflare.types.radar.netflows.top_locations_response import TopLocationsResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/quality/speed/test_top.py b/tests/api_resources/radar/quality/speed/test_top.py index 27ff511eecb..ed60dd3d125 100644 --- a/tests/api_resources/radar/quality/speed/test_top.py +++ b/tests/api_resources/radar/quality/speed/test_top.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.quality.speed import ( - TopAsesResponse, - TopLocationsResponse, -) +from cloudflare.types.radar.quality.speed.top_ases_response import TopAsesResponse +from cloudflare.types.radar.quality.speed.top_locations_response import TopLocationsResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/quality/test_iqi.py b/tests/api_resources/radar/quality/test_iqi.py index 06a57e35778..dc22a1944d5 100644 --- a/tests/api_resources/radar/quality/test_iqi.py +++ b/tests/api_resources/radar/quality/test_iqi.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.quality import ( - IQISummaryResponse, - IQITimeseriesGroupsResponse, -) +from cloudflare.types.radar.quality.iqi_summary_response import IQISummaryResponse +from cloudflare.types.radar.quality.iqi_timeseries_groups_response import IQITimeseriesGroupsResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/quality/test_speed.py b/tests/api_resources/radar/quality/test_speed.py index 00683ae6c18..3019b6d3a8b 100644 --- a/tests/api_resources/radar/quality/test_speed.py +++ b/tests/api_resources/radar/quality/test_speed.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.quality import ( - SpeedSummaryResponse, - SpeedHistogramResponse, -) +from cloudflare.types.radar.quality.speed_summary_response import SpeedSummaryResponse +from cloudflare.types.radar.quality.speed_histogram_response import SpeedHistogramResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/ranking/test_domain.py b/tests/api_resources/radar/ranking/test_domain.py index 44269df75ae..cbaa37decfd 100644 --- a/tests/api_resources/radar/ranking/test_domain.py +++ b/tests/api_resources/radar/ranking/test_domain.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.radar.ranking import DomainGetResponse +from cloudflare.types.radar.ranking.domain_get_response import DomainGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/test_as112.py b/tests/api_resources/radar/test_as112.py index a6dde128ac6..47ee30050e5 100644 --- a/tests/api_resources/radar/test_as112.py +++ b/tests/api_resources/radar/test_as112.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar import AS112TimeseriesResponse +from cloudflare.types.radar.as112_timeseries_response import AS112TimeseriesResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/test_bgp.py b/tests/api_resources/radar/test_bgp.py index ab993f872e2..c86c2e4db70 100644 --- a/tests/api_resources/radar/test_bgp.py +++ b/tests/api_resources/radar/test_bgp.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar import BGPTimeseriesResponse +from cloudflare.types.radar.bgp_timeseries_response import BGPTimeseriesResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/test_connection_tampering.py b/tests/api_resources/radar/test_connection_tampering.py index d36693462b8..c91e8f1312b 100644 --- a/tests/api_resources/radar/test_connection_tampering.py +++ b/tests/api_resources/radar/test_connection_tampering.py @@ -10,8 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar import ( - ConnectionTamperingSummaryResponse, +from cloudflare.types.radar.connection_tampering_summary_response import ConnectionTamperingSummaryResponse +from cloudflare.types.radar.connection_tampering_timeseries_groups_response import ( ConnectionTamperingTimeseriesGroupsResponse, ) diff --git a/tests/api_resources/radar/test_datasets.py b/tests/api_resources/radar/test_datasets.py index 006dca3cb20..291fd3b8c9d 100644 --- a/tests/api_resources/radar/test_datasets.py +++ b/tests/api_resources/radar/test_datasets.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.radar import ( - DatasetListResponse, - DatasetDownloadResponse, -) +from cloudflare.types.radar.dataset_list_response import DatasetListResponse +from cloudflare.types.radar.dataset_download_response import DatasetDownloadResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/test_entities.py b/tests/api_resources/radar/test_entities.py index fc22e4c3f65..656495e08a7 100644 --- a/tests/api_resources/radar/test_entities.py +++ b/tests/api_resources/radar/test_entities.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.radar import EntityGetResponse +from cloudflare.types.radar.entity_get_response import EntityGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/test_netflows.py b/tests/api_resources/radar/test_netflows.py index 79002a4a227..fc8550d43b1 100644 --- a/tests/api_resources/radar/test_netflows.py +++ b/tests/api_resources/radar/test_netflows.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar import NetflowTimeseriesResponse +from cloudflare.types.radar.netflow_timeseries_response import NetflowTimeseriesResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/test_ranking.py b/tests/api_resources/radar/test_ranking.py index 9aeac63890b..a2fed566e61 100644 --- a/tests/api_resources/radar/test_ranking.py +++ b/tests/api_resources/radar/test_ranking.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar import ( - RankingTopResponse, - RankingTimeseriesGroupsResponse, -) +from cloudflare.types.radar.ranking_top_response import RankingTopResponse +from cloudflare.types.radar.ranking_timeseries_groups_response import RankingTimeseriesGroupsResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/test_search.py b/tests/api_resources/radar/test_search.py index fbc22c27dff..2a3270d0761 100644 --- a/tests/api_resources/radar/test_search.py +++ b/tests/api_resources/radar/test_search.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.radar import SearchGlobalResponse +from cloudflare.types.radar.search_global_response import SearchGlobalResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/test_traffic_anomalies.py b/tests/api_resources/radar/test_traffic_anomalies.py index ab42d798d32..e4b6ac48ed1 100644 --- a/tests/api_resources/radar/test_traffic_anomalies.py +++ b/tests/api_resources/radar/test_traffic_anomalies.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar import TrafficAnomalyGetResponse +from cloudflare.types.radar.traffic_anomaly_get_response import TrafficAnomalyGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/traffic_anomalies/test_locations.py b/tests/api_resources/radar/traffic_anomalies/test_locations.py index ba164303c0b..db7461986c4 100644 --- a/tests/api_resources/radar/traffic_anomalies/test_locations.py +++ b/tests/api_resources/radar/traffic_anomalies/test_locations.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.traffic_anomalies import LocationGetResponse +from cloudflare.types.radar.traffic_anomalies.location_get_response import LocationGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/radar/verified_bots/test_top.py b/tests/api_resources/radar/verified_bots/test_top.py index 8ed74c070bd..76b20f090c3 100644 --- a/tests/api_resources/radar/verified_bots/test_top.py +++ b/tests/api_resources/radar/verified_bots/test_top.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.radar.verified_bots import ( - TopBotsResponse, - TopCategoriesResponse, -) +from cloudflare.types.radar.verified_bots.top_bots_response import TopBotsResponse +from cloudflare.types.radar.verified_bots.top_categories_response import TopCategoriesResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/registrar/test_domains.py b/tests/api_resources/registrar/test_domains.py index 924582e2af1..a405f94ec25 100644 --- a/tests/api_resources/registrar/test_domains.py +++ b/tests/api_resources/registrar/test_domains.py @@ -10,7 +10,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.registrar import Domain, DomainGetResponse, DomainUpdateResponse +from cloudflare.types.registrar.domain import Domain +from cloudflare.types.registrar.domain_get_response import DomainGetResponse +from cloudflare.types.registrar.domain_update_response import DomainUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/request_tracers/test_traces.py b/tests/api_resources/request_tracers/test_traces.py index ebd56a1359a..b62bb594f36 100644 --- a/tests/api_resources/request_tracers/test_traces.py +++ b/tests/api_resources/request_tracers/test_traces.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.request_tracers import TraceCreateResponse +from cloudflare.types.request_tracers.trace_create_response import TraceCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/rules/lists/test_bulk_operations.py b/tests/api_resources/rules/lists/test_bulk_operations.py index afc1fac33f2..c692c4c21a2 100644 --- a/tests/api_resources/rules/lists/test_bulk_operations.py +++ b/tests/api_resources/rules/lists/test_bulk_operations.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.rules.lists import BulkOperationGetResponse +from cloudflare.types.rules.lists.bulk_operation_get_response import BulkOperationGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/rules/lists/test_items.py b/tests/api_resources/rules/lists/test_items.py index c2efab25330..7b5888b8e83 100644 --- a/tests/api_resources/rules/lists/test_items.py +++ b/tests/api_resources/rules/lists/test_items.py @@ -10,12 +10,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncCursorPagination, AsyncCursorPagination -from cloudflare.types.rules.lists import ( - ItemGetResponse, - ItemCreateResponse, - ItemDeleteResponse, - ItemUpdateResponse, -) +from cloudflare.types.rules.lists.item_get_response import ItemGetResponse +from cloudflare.types.rules.lists.item_create_response import ItemCreateResponse +from cloudflare.types.rules.lists.item_delete_response import ItemDeleteResponse +from cloudflare.types.rules.lists.item_update_response import ItemUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/rules/test_lists.py b/tests/api_resources/rules/test_lists.py index c63a54d2fa1..928a53d89c3 100644 --- a/tests/api_resources/rules/test_lists.py +++ b/tests/api_resources/rules/test_lists.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.rules import ( - ListsList, - ListDeleteResponse, -) +from cloudflare.types.rules.lists_list import ListsList +from cloudflare.types.rules.list_delete_response import ListDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/rulesets/phases/test_versions.py b/tests/api_resources/rulesets/phases/test_versions.py index ab4e35406ce..e8db8adaf1e 100644 --- a/tests/api_resources/rulesets/phases/test_versions.py +++ b/tests/api_resources/rulesets/phases/test_versions.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.rulesets import Ruleset -from cloudflare.types.rulesets.phases import VersionGetResponse +from cloudflare.types.rulesets.ruleset import Ruleset +from cloudflare.types.rulesets.phases.version_get_response import VersionGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/rulesets/test_phases.py b/tests/api_resources/rulesets/test_phases.py index 63fb6253667..043b1b5e3b4 100644 --- a/tests/api_resources/rulesets/test_phases.py +++ b/tests/api_resources/rulesets/test_phases.py @@ -9,7 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.rulesets import PhaseGetResponse, PhaseUpdateResponse +from cloudflare.types.rulesets.phase_get_response import PhaseGetResponse +from cloudflare.types.rulesets.phase_update_response import PhaseUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/rulesets/test_rules.py b/tests/api_resources/rulesets/test_rules.py index bfa711e3da1..f8d39340c0b 100644 --- a/tests/api_resources/rulesets/test_rules.py +++ b/tests/api_resources/rulesets/test_rules.py @@ -9,11 +9,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.rulesets import ( - RuleEditResponse, - RuleCreateResponse, - RuleDeleteResponse, -) +from cloudflare.types.rulesets.rule_edit_response import RuleEditResponse +from cloudflare.types.rulesets.rule_create_response import RuleCreateResponse +from cloudflare.types.rulesets.rule_delete_response import RuleDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/rulesets/test_versions.py b/tests/api_resources/rulesets/test_versions.py index 54605005c49..10a620f81c8 100644 --- a/tests/api_resources/rulesets/test_versions.py +++ b/tests/api_resources/rulesets/test_versions.py @@ -10,7 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.rulesets import Ruleset, VersionGetResponse +from cloudflare.types.rulesets.ruleset import Ruleset +from cloudflare.types.rulesets.version_get_response import VersionGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/rulesets/versions/test_by_tag.py b/tests/api_resources/rulesets/versions/test_by_tag.py index cc093ff3578..029f0e86bcd 100644 --- a/tests/api_resources/rulesets/versions/test_by_tag.py +++ b/tests/api_resources/rulesets/versions/test_by_tag.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.rulesets.versions import ByTagGetResponse +from cloudflare.types.rulesets.versions.by_tag_get_response import ByTagGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/rum/test_rules.py b/tests/api_resources/rum/test_rules.py index 0250949fba5..42de0030a31 100644 --- a/tests/api_resources/rum/test_rules.py +++ b/tests/api_resources/rum/test_rules.py @@ -9,7 +9,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.rum import RUMRule, RuleListResponse, RuleDeleteResponse +from cloudflare.types.rum.rum_rule import RUMRule +from cloudflare.types.rum.rule_list_response import RuleListResponse +from cloudflare.types.rum.rule_delete_response import RuleDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/rum/test_site_info.py b/tests/api_resources/rum/test_site_info.py index a1f892e4669..44282f4fff2 100644 --- a/tests/api_resources/rum/test_site_info.py +++ b/tests/api_resources/rum/test_site_info.py @@ -9,11 +9,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.rum import ( - Site, - SiteInfoDeleteResponse, -) from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray +from cloudflare.types.rum.site import Site +from cloudflare.types.rum.site_info_delete_response import SiteInfoDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/secondary_dns/test_acls.py b/tests/api_resources/secondary_dns/test_acls.py index 2b05db03287..3ad485b79c3 100644 --- a/tests/api_resources/secondary_dns/test_acls.py +++ b/tests/api_resources/secondary_dns/test_acls.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.secondary_dns import ( - ACL, - ACLDeleteResponse, -) +from cloudflare.types.secondary_dns.acl import ACL +from cloudflare.types.secondary_dns.acl_delete_response import ACLDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/secondary_dns/test_incoming.py b/tests/api_resources/secondary_dns/test_incoming.py index d1e07ab8c8d..849ca7e321a 100644 --- a/tests/api_resources/secondary_dns/test_incoming.py +++ b/tests/api_resources/secondary_dns/test_incoming.py @@ -9,12 +9,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.secondary_dns import ( - IncomingGetResponse, - IncomingCreateResponse, - IncomingDeleteResponse, - IncomingUpdateResponse, -) +from cloudflare.types.secondary_dns.incoming_get_response import IncomingGetResponse +from cloudflare.types.secondary_dns.incoming_create_response import IncomingCreateResponse +from cloudflare.types.secondary_dns.incoming_delete_response import IncomingDeleteResponse +from cloudflare.types.secondary_dns.incoming_update_response import IncomingUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/secondary_dns/test_outgoing.py b/tests/api_resources/secondary_dns/test_outgoing.py index 8f1280a12c2..161b2a57386 100644 --- a/tests/api_resources/secondary_dns/test_outgoing.py +++ b/tests/api_resources/secondary_dns/test_outgoing.py @@ -9,12 +9,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.secondary_dns import ( - OutgoingGetResponse, - OutgoingCreateResponse, - OutgoingDeleteResponse, - OutgoingUpdateResponse, -) +from cloudflare.types.secondary_dns.outgoing_get_response import OutgoingGetResponse +from cloudflare.types.secondary_dns.outgoing_create_response import OutgoingCreateResponse +from cloudflare.types.secondary_dns.outgoing_delete_response import OutgoingDeleteResponse +from cloudflare.types.secondary_dns.outgoing_update_response import OutgoingUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/secondary_dns/test_peers.py b/tests/api_resources/secondary_dns/test_peers.py index 1de87b407c4..5b42901b1a2 100644 --- a/tests/api_resources/secondary_dns/test_peers.py +++ b/tests/api_resources/secondary_dns/test_peers.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.secondary_dns import ( - Peer, - PeerDeleteResponse, -) +from cloudflare.types.secondary_dns.peer import Peer +from cloudflare.types.secondary_dns.peer_delete_response import PeerDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/secondary_dns/test_tsigs.py b/tests/api_resources/secondary_dns/test_tsigs.py index e4d734d402d..95e6828e389 100644 --- a/tests/api_resources/secondary_dns/test_tsigs.py +++ b/tests/api_resources/secondary_dns/test_tsigs.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.secondary_dns import ( - TSIG, - TSIGDeleteResponse, -) +from cloudflare.types.secondary_dns.tsig import TSIG +from cloudflare.types.secondary_dns.tsig_delete_response import TSIGDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/snippets/test_rules.py b/tests/api_resources/snippets/test_rules.py index 83e10168142..0a54c1b008c 100644 --- a/tests/api_resources/snippets/test_rules.py +++ b/tests/api_resources/snippets/test_rules.py @@ -10,7 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.snippets import RuleListResponse, RuleUpdateResponse +from cloudflare.types.snippets.rule_list_response import RuleListResponse +from cloudflare.types.snippets.rule_update_response import RuleUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/spectrum/analytics/aggregates/test_currents.py b/tests/api_resources/spectrum/analytics/aggregates/test_currents.py index 637e44bfece..93e2b964a2a 100644 --- a/tests/api_resources/spectrum/analytics/aggregates/test_currents.py +++ b/tests/api_resources/spectrum/analytics/aggregates/test_currents.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.spectrum.analytics.aggregates import CurrentGetResponse +from cloudflare.types.spectrum.analytics.aggregates.current_get_response import CurrentGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/spectrum/analytics/events/test_bytimes.py b/tests/api_resources/spectrum/analytics/events/test_bytimes.py index 9afdcf9b72a..969bfefbfd0 100644 --- a/tests/api_resources/spectrum/analytics/events/test_bytimes.py +++ b/tests/api_resources/spectrum/analytics/events/test_bytimes.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.spectrum.analytics.events import BytimeGetResponse +from cloudflare.types.spectrum.analytics.events.bytime_get_response import BytimeGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/spectrum/analytics/events/test_summaries.py b/tests/api_resources/spectrum/analytics/events/test_summaries.py index 5f19bf08707..9b81d31b467 100644 --- a/tests/api_resources/spectrum/analytics/events/test_summaries.py +++ b/tests/api_resources/spectrum/analytics/events/test_summaries.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.spectrum.analytics.events import SummaryGetResponse +from cloudflare.types.spectrum.analytics.events.summary_get_response import SummaryGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/spectrum/test_apps.py b/tests/api_resources/spectrum/test_apps.py index 1c99356b97a..ebd8c1e2746 100644 --- a/tests/api_resources/spectrum/test_apps.py +++ b/tests/api_resources/spectrum/test_apps.py @@ -10,12 +10,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.spectrum import ( - AppGetResponse, - AppCreateResponse, - AppDeleteResponse, - AppUpdateResponse, -) +from cloudflare.types.spectrum.app_get_response import AppGetResponse +from cloudflare.types.spectrum.app_create_response import AppCreateResponse +from cloudflare.types.spectrum.app_delete_response import AppDeleteResponse +from cloudflare.types.spectrum.app_update_response import AppUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/speed/test_availabilities.py b/tests/api_resources/speed/test_availabilities.py index 1d651c0cda6..47b6e89cc3d 100644 --- a/tests/api_resources/speed/test_availabilities.py +++ b/tests/api_resources/speed/test_availabilities.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.speed import Availability +from cloudflare.types.speed.availability import Availability base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/speed/test_pages.py b/tests/api_resources/speed/test_pages.py index cee5ec5833e..6fbcf9fde3b 100644 --- a/tests/api_resources/speed/test_pages.py +++ b/tests/api_resources/speed/test_pages.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.speed import PageListResponse +from cloudflare.types.speed.page_list_response import PageListResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/speed/test_schedule.py b/tests/api_resources/speed/test_schedule.py index 99d2657e184..4806abe3b57 100644 --- a/tests/api_resources/speed/test_schedule.py +++ b/tests/api_resources/speed/test_schedule.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.speed import ScheduleCreateResponse +from cloudflare.types.speed.schedule_create_response import ScheduleCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/speed/test_tests.py b/tests/api_resources/speed/test_tests.py index fc85d909d50..6ee2a270944 100644 --- a/tests/api_resources/speed/test_tests.py +++ b/tests/api_resources/speed/test_tests.py @@ -9,11 +9,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.speed import ( - Test, - TestListResponse, - TestDeleteResponse, -) +from cloudflare.types.speed.test import Test +from cloudflare.types.speed.test_list_response import TestListResponse +from cloudflare.types.speed.test_delete_response import TestDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/ssl/certificate_packs/test_order.py b/tests/api_resources/ssl/certificate_packs/test_order.py index 5ad50e00c71..d50810563ee 100644 --- a/tests/api_resources/ssl/certificate_packs/test_order.py +++ b/tests/api_resources/ssl/certificate_packs/test_order.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.ssl.certificate_packs import OrderCreateResponse +from cloudflare.types.ssl.certificate_packs.order_create_response import OrderCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/ssl/certificate_packs/test_quota.py b/tests/api_resources/ssl/certificate_packs/test_quota.py index 22d983db7f1..8d9e3d161a0 100644 --- a/tests/api_resources/ssl/certificate_packs/test_quota.py +++ b/tests/api_resources/ssl/certificate_packs/test_quota.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.ssl.certificate_packs import QuotaGetResponse +from cloudflare.types.ssl.certificate_packs.quota_get_response import QuotaGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/ssl/test_analyze.py b/tests/api_resources/ssl/test_analyze.py index ce96ca2df0c..4eaa1a711c4 100644 --- a/tests/api_resources/ssl/test_analyze.py +++ b/tests/api_resources/ssl/test_analyze.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.ssl import AnalyzeCreateResponse +from cloudflare.types.ssl.analyze_create_response import AnalyzeCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/ssl/test_certificate_packs.py b/tests/api_resources/ssl/test_certificate_packs.py index 8cc4c1436fe..ae9070a08c5 100644 --- a/tests/api_resources/ssl/test_certificate_packs.py +++ b/tests/api_resources/ssl/test_certificate_packs.py @@ -9,12 +9,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.ssl import ( - CertificatePackGetResponse, - CertificatePackEditResponse, - CertificatePackDeleteResponse, -) from cloudflare.pagination import SyncSinglePage, AsyncSinglePage +from cloudflare.types.ssl.certificate_pack_get_response import CertificatePackGetResponse +from cloudflare.types.ssl.certificate_pack_edit_response import CertificatePackEditResponse +from cloudflare.types.ssl.certificate_pack_delete_response import CertificatePackDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/ssl/test_recommendations.py b/tests/api_resources/ssl/test_recommendations.py index 31e42e5ed46..f164d6d5e05 100644 --- a/tests/api_resources/ssl/test_recommendations.py +++ b/tests/api_resources/ssl/test_recommendations.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.ssl import RecommendationGetResponse +from cloudflare.types.ssl.recommendation_get_response import RecommendationGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/ssl/test_verification.py b/tests/api_resources/ssl/test_verification.py index e93667109d1..aa8d2e07f04 100644 --- a/tests/api_resources/ssl/test_verification.py +++ b/tests/api_resources/ssl/test_verification.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.ssl import ( - VerificationGetResponse, - VerificationEditResponse, -) +from cloudflare.types.ssl.verification_get_response import VerificationGetResponse +from cloudflare.types.ssl.verification_edit_response import VerificationEditResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/ssl/universal/test_settings.py b/tests/api_resources/ssl/universal/test_settings.py index 027e556f715..2d808b06815 100644 --- a/tests/api_resources/ssl/universal/test_settings.py +++ b/tests/api_resources/ssl/universal/test_settings.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.ssl.universal import UniversalSSLSettings +from cloudflare.types.ssl.universal.universal_ssl_settings import UniversalSSLSettings base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/storage/test_analytics.py b/tests/api_resources/storage/test_analytics.py index 0a6e3064dcf..3b29ccbcaaf 100644 --- a/tests/api_resources/storage/test_analytics.py +++ b/tests/api_resources/storage/test_analytics.py @@ -10,7 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.storage import Schema, Components +from cloudflare.types.storage.schema import Schema +from cloudflare.types.storage.components import Components base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/stream/captions/test_language.py b/tests/api_resources/stream/captions/test_language.py index 59e1bdcb7b2..21ca8abb7f0 100644 --- a/tests/api_resources/stream/captions/test_language.py +++ b/tests/api_resources/stream/captions/test_language.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.stream import Caption +from cloudflare.types.stream.caption import Caption base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/stream/live_inputs/test_outputs.py b/tests/api_resources/stream/live_inputs/test_outputs.py index a02b342ef61..c65c0428bdf 100644 --- a/tests/api_resources/stream/live_inputs/test_outputs.py +++ b/tests/api_resources/stream/live_inputs/test_outputs.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.stream.live_inputs import Output +from cloudflare.types.stream.live_inputs.output import Output base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/stream/test_audio_tracks.py b/tests/api_resources/stream/test_audio_tracks.py index 71756af4ca3..891eb6ea9e0 100644 --- a/tests/api_resources/stream/test_audio_tracks.py +++ b/tests/api_resources/stream/test_audio_tracks.py @@ -9,11 +9,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.stream import ( - Audio, - AudioTrackGetResponse, - AudioTrackDeleteResponse, -) +from cloudflare.types.stream.audio import Audio +from cloudflare.types.stream.audio_track_get_response import AudioTrackGetResponse +from cloudflare.types.stream.audio_track_delete_response import AudioTrackDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/stream/test_captions.py b/tests/api_resources/stream/test_captions.py index b2466c27733..9afa84a290e 100644 --- a/tests/api_resources/stream/test_captions.py +++ b/tests/api_resources/stream/test_captions.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.stream import CaptionGetResponse +from cloudflare.types.stream.caption_get_response import CaptionGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/stream/test_clip.py b/tests/api_resources/stream/test_clip.py index 3386eec53e7..2a96300b3da 100644 --- a/tests/api_resources/stream/test_clip.py +++ b/tests/api_resources/stream/test_clip.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.stream import Clip +from cloudflare.types.stream.clip import Clip base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/stream/test_copy.py b/tests/api_resources/stream/test_copy.py index 03849cde63e..2aff75a9dea 100644 --- a/tests/api_resources/stream/test_copy.py +++ b/tests/api_resources/stream/test_copy.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.stream import Video +from cloudflare.types.stream.video import Video base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/stream/test_direct_upload.py b/tests/api_resources/stream/test_direct_upload.py index 88e93522a5a..c28073f73e8 100644 --- a/tests/api_resources/stream/test_direct_upload.py +++ b/tests/api_resources/stream/test_direct_upload.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.stream import DirectUploadCreateResponse +from cloudflare.types.stream.direct_upload_create_response import DirectUploadCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/stream/test_downloads.py b/tests/api_resources/stream/test_downloads.py index b5fda9a4b9d..ed715f7aa37 100644 --- a/tests/api_resources/stream/test_downloads.py +++ b/tests/api_resources/stream/test_downloads.py @@ -9,11 +9,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.stream import ( - DownloadGetResponse, - DownloadCreateResponse, - DownloadDeleteResponse, -) +from cloudflare.types.stream.download_get_response import DownloadGetResponse +from cloudflare.types.stream.download_create_response import DownloadCreateResponse +from cloudflare.types.stream.download_delete_response import DownloadDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/stream/test_keys.py b/tests/api_resources/stream/test_keys.py index 2be86064c48..ceaa98aa080 100644 --- a/tests/api_resources/stream/test_keys.py +++ b/tests/api_resources/stream/test_keys.py @@ -9,7 +9,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.stream import Keys, KeyGetResponse, KeyDeleteResponse +from cloudflare.types.stream.keys import Keys +from cloudflare.types.stream.key_get_response import KeyGetResponse +from cloudflare.types.stream.key_delete_response import KeyDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/stream/test_live_inputs.py b/tests/api_resources/stream/test_live_inputs.py index f68199a02da..9b3f0b4e00b 100644 --- a/tests/api_resources/stream/test_live_inputs.py +++ b/tests/api_resources/stream/test_live_inputs.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.stream import ( - LiveInput, - LiveInputListResponse, -) +from cloudflare.types.stream.live_input import LiveInput +from cloudflare.types.stream.live_input_list_response import LiveInputListResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/stream/test_token.py b/tests/api_resources/stream/test_token.py index 4fea7d3ac62..511470e6f7f 100644 --- a/tests/api_resources/stream/test_token.py +++ b/tests/api_resources/stream/test_token.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.stream import TokenCreateResponse +from cloudflare.types.stream.token_create_response import TokenCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/stream/test_videos.py b/tests/api_resources/stream/test_videos.py index d3558da187c..40da5c76df6 100644 --- a/tests/api_resources/stream/test_videos.py +++ b/tests/api_resources/stream/test_videos.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.stream import VideoStorageUsageResponse +from cloudflare.types.stream.video_storage_usage_response import VideoStorageUsageResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/stream/test_watermarks.py b/tests/api_resources/stream/test_watermarks.py index 212a32853a6..98dda7d2eea 100644 --- a/tests/api_resources/stream/test_watermarks.py +++ b/tests/api_resources/stream/test_watermarks.py @@ -10,7 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.stream import Watermark, WatermarkDeleteResponse +from cloudflare.types.stream.watermark import Watermark +from cloudflare.types.stream.watermark_delete_response import WatermarkDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/stream/test_webhooks.py b/tests/api_resources/stream/test_webhooks.py index c2ba269535c..1d12486dc4d 100644 --- a/tests/api_resources/stream/test_webhooks.py +++ b/tests/api_resources/stream/test_webhooks.py @@ -9,11 +9,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.stream import ( - WebhookGetResponse, - WebhookDeleteResponse, - WebhookUpdateResponse, -) +from cloudflare.types.stream.webhook_get_response import WebhookGetResponse +from cloudflare.types.stream.webhook_delete_response import WebhookDeleteResponse +from cloudflare.types.stream.webhook_update_response import WebhookUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_accounts.py b/tests/api_resources/test_accounts.py index c7b2f9d72ae..51e98532e61 100644 --- a/tests/api_resources/test_accounts.py +++ b/tests/api_resources/test_accounts.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.accounts import ( - AccountGetResponse, - AccountUpdateResponse, -) +from cloudflare.types.accounts.account_get_response import AccountGetResponse +from cloudflare.types.accounts.account_update_response import AccountUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_audit_logs.py b/tests/api_resources/test_audit_logs.py index 1e5562aa2f7..23d4ac0f501 100644 --- a/tests/api_resources/test_audit_logs.py +++ b/tests/api_resources/test_audit_logs.py @@ -11,7 +11,7 @@ from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.shared import AuditLog +from cloudflare.types.shared.audit_log import AuditLog base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_bot_management.py b/tests/api_resources/test_bot_management.py index 89ed539135b..c5973199ca4 100644 --- a/tests/api_resources/test_bot_management.py +++ b/tests/api_resources/test_bot_management.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.bot_management import ( - BotManagementGetResponse, - BotManagementUpdateResponse, -) +from cloudflare.types.bot_management.bot_management_get_response import BotManagementGetResponse +from cloudflare.types.bot_management.bot_management_update_response import BotManagementUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_brand_protection.py b/tests/api_resources/test_brand_protection.py index 61e951f87a5..c2650214b0c 100644 --- a/tests/api_resources/test_brand_protection.py +++ b/tests/api_resources/test_brand_protection.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.brand_protection import ( - Info, - Submit, -) +from cloudflare.types.brand_protection.info import Info +from cloudflare.types.brand_protection.submit import Submit base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_cache.py b/tests/api_resources/test_cache.py index c1650d57e93..46117860cef 100644 --- a/tests/api_resources/test_cache.py +++ b/tests/api_resources/test_cache.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.cache import CachePurgeResponse +from cloudflare.types.cache.cache_purge_response import CachePurgeResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_calls.py b/tests/api_resources/test_calls.py index 1198441de22..74cdb30b81f 100644 --- a/tests/api_resources/test_calls.py +++ b/tests/api_resources/test_calls.py @@ -10,7 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.calls import CallsApp, CallsAppWithSecret +from cloudflare.types.calls.calls_app import CallsApp +from cloudflare.types.calls.calls_app_with_secret import CallsAppWithSecret base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_client_certificates.py b/tests/api_resources/test_client_certificates.py index 307a72b3d52..b94b604167d 100644 --- a/tests/api_resources/test_client_certificates.py +++ b/tests/api_resources/test_client_certificates.py @@ -10,9 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.client_certificates import ( - ClientCertificate, -) +from cloudflare.types.client_certificates.client_certificate import ClientCertificate base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_custom_certificates.py b/tests/api_resources/test_custom_certificates.py index b5fab9af7a1..a8344aafafc 100644 --- a/tests/api_resources/test_custom_certificates.py +++ b/tests/api_resources/test_custom_certificates.py @@ -10,13 +10,11 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.custom_certificates import ( - CustomCertificate, - CustomCertificateGetResponse, - CustomCertificateEditResponse, - CustomCertificateCreateResponse, - CustomCertificateDeleteResponse, -) +from cloudflare.types.custom_certificates.custom_certificate import CustomCertificate +from cloudflare.types.custom_certificates.custom_certificate_get_response import CustomCertificateGetResponse +from cloudflare.types.custom_certificates.custom_certificate_edit_response import CustomCertificateEditResponse +from cloudflare.types.custom_certificates.custom_certificate_create_response import CustomCertificateCreateResponse +from cloudflare.types.custom_certificates.custom_certificate_delete_response import CustomCertificateDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_custom_hostnames.py b/tests/api_resources/test_custom_hostnames.py index 2b80903b4ef..57e45edfece 100644 --- a/tests/api_resources/test_custom_hostnames.py +++ b/tests/api_resources/test_custom_hostnames.py @@ -10,13 +10,11 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.custom_hostnames import ( - CustomHostnameGetResponse, - CustomHostnameEditResponse, - CustomHostnameListResponse, - CustomHostnameCreateResponse, - CustomHostnameDeleteResponse, -) +from cloudflare.types.custom_hostnames.custom_hostname_get_response import CustomHostnameGetResponse +from cloudflare.types.custom_hostnames.custom_hostname_edit_response import CustomHostnameEditResponse +from cloudflare.types.custom_hostnames.custom_hostname_list_response import CustomHostnameListResponse +from cloudflare.types.custom_hostnames.custom_hostname_create_response import CustomHostnameCreateResponse +from cloudflare.types.custom_hostnames.custom_hostname_delete_response import CustomHostnameDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_custom_nameservers.py b/tests/api_resources/test_custom_nameservers.py index f85006a7d77..02602c51933 100644 --- a/tests/api_resources/test_custom_nameservers.py +++ b/tests/api_resources/test_custom_nameservers.py @@ -9,11 +9,11 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.custom_nameservers import ( - CustomNameserver, - CustomNameserverGetResponse, - CustomNameserverDeleteResponse, - CustomNameserverVerifyResponse, +from cloudflare.types.custom_nameservers.custom_nameserver import CustomNameserver +from cloudflare.types.custom_nameservers.custom_nameserver_get_response import CustomNameserverGetResponse +from cloudflare.types.custom_nameservers.custom_nameserver_delete_response import CustomNameserverDeleteResponse +from cloudflare.types.custom_nameservers.custom_nameserver_verify_response import CustomNameserverVerifyResponse +from cloudflare.types.custom_nameservers.custom_nameserver_availabilty_response import ( CustomNameserverAvailabiltyResponse, ) diff --git a/tests/api_resources/test_dnssec.py b/tests/api_resources/test_dnssec.py index dbccb299de5..6d2766683d3 100644 --- a/tests/api_resources/test_dnssec.py +++ b/tests/api_resources/test_dnssec.py @@ -9,7 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.dnssec import DNSSEC, DNSSECDeleteResponse +from cloudflare.types.dnssec.dnssec import DNSSEC +from cloudflare.types.dnssec.dnssec_delete_response import DNSSECDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_email_routing.py b/tests/api_resources/test_email_routing.py index 92d55fc3c61..9ee514a81ce 100644 --- a/tests/api_resources/test_email_routing.py +++ b/tests/api_resources/test_email_routing.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.email_routing import Settings +from cloudflare.types.email_routing.settings import Settings base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_filters.py b/tests/api_resources/test_filters.py index c4db83fbe0d..bea75db8e20 100644 --- a/tests/api_resources/test_filters.py +++ b/tests/api_resources/test_filters.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.filters import ( - FirewallFilter, - FilterCreateResponse, -) +from cloudflare.types.filters.firewall_filter import FirewallFilter +from cloudflare.types.filters.filter_create_response import FilterCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_healthchecks.py b/tests/api_resources/test_healthchecks.py index 9103f49468f..bb7bba49016 100644 --- a/tests/api_resources/test_healthchecks.py +++ b/tests/api_resources/test_healthchecks.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.healthchecks import ( - Healthcheck, - HealthcheckDeleteResponse, -) +from cloudflare.types.healthchecks.healthcheck import Healthcheck +from cloudflare.types.healthchecks.healthcheck_delete_response import HealthcheckDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_ips.py b/tests/api_resources/test_ips.py index 6d5ecbb730f..6a5ecb6eced 100644 --- a/tests/api_resources/test_ips.py +++ b/tests/api_resources/test_ips.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.ips import IPListResponse +from cloudflare.types.ips.ip_list_response import IPListResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_keyless_certificates.py b/tests/api_resources/test_keyless_certificates.py index 2fda38574ca..0125ed3cc7a 100644 --- a/tests/api_resources/test_keyless_certificates.py +++ b/tests/api_resources/test_keyless_certificates.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.keyless_certificates import ( - KeylessCertificate, - KeylessCertificateDeleteResponse, -) +from cloudflare.types.keyless_certificates.keyless_certificate import KeylessCertificate +from cloudflare.types.keyless_certificates.keyless_certificate_delete_response import KeylessCertificateDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_load_balancers.py b/tests/api_resources/test_load_balancers.py index e81f848af0b..c34be32b75e 100644 --- a/tests/api_resources/test_load_balancers.py +++ b/tests/api_resources/test_load_balancers.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.load_balancers import ( - LoadBalancer, - LoadBalancerDeleteResponse, -) +from cloudflare.types.load_balancers.load_balancer import LoadBalancer +from cloudflare.types.load_balancers.load_balancer_delete_response import LoadBalancerDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_managed_headers.py b/tests/api_resources/test_managed_headers.py index f84f3910e47..0c1ddcaa5db 100644 --- a/tests/api_resources/test_managed_headers.py +++ b/tests/api_resources/test_managed_headers.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.managed_headers import ( - ManagedHeaderEditResponse, - ManagedHeaderListResponse, -) +from cloudflare.types.managed_headers.managed_header_edit_response import ManagedHeaderEditResponse +from cloudflare.types.managed_headers.managed_header_list_response import ManagedHeaderListResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_memberships.py b/tests/api_resources/test_memberships.py index e4e6916b468..09458896e93 100644 --- a/tests/api_resources/test_memberships.py +++ b/tests/api_resources/test_memberships.py @@ -10,12 +10,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.memberships import ( - Membership, - MembershipGetResponse, - MembershipDeleteResponse, - MembershipUpdateResponse, -) +from cloudflare.types.memberships.membership import Membership +from cloudflare.types.memberships.membership_get_response import MembershipGetResponse +from cloudflare.types.memberships.membership_delete_response import MembershipDeleteResponse +from cloudflare.types.memberships.membership_update_response import MembershipUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_mtls_certificates.py b/tests/api_resources/test_mtls_certificates.py index 9ea40b98793..4367b45bac9 100644 --- a/tests/api_resources/test_mtls_certificates.py +++ b/tests/api_resources/test_mtls_certificates.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.mtls_certificates import ( - MTLSCertificate, - MTLSCertificateCreateResponse, -) +from cloudflare.types.mtls_certificates.mtls_certificate import MTLSCertificate +from cloudflare.types.mtls_certificates.mtls_certificate_create_response import MTLSCertificateCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_origin_ca_certificates.py b/tests/api_resources/test_origin_ca_certificates.py index f079d8895bd..1634e513180 100644 --- a/tests/api_resources/test_origin_ca_certificates.py +++ b/tests/api_resources/test_origin_ca_certificates.py @@ -10,10 +10,12 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.origin_ca_certificates import ( - OriginCACertificate, - OriginCACertificateGetResponse, +from cloudflare.types.origin_ca_certificates.origin_ca_certificate import OriginCACertificate +from cloudflare.types.origin_ca_certificates.origin_ca_certificate_get_response import OriginCACertificateGetResponse +from cloudflare.types.origin_ca_certificates.origin_ca_certificate_create_response import ( OriginCACertificateCreateResponse, +) +from cloudflare.types.origin_ca_certificates.origin_ca_certificate_delete_response import ( OriginCACertificateDeleteResponse, ) diff --git a/tests/api_resources/test_origin_post_quantum_encryption.py b/tests/api_resources/test_origin_post_quantum_encryption.py index 0c73b6de410..019ff719faf 100644 --- a/tests/api_resources/test_origin_post_quantum_encryption.py +++ b/tests/api_resources/test_origin_post_quantum_encryption.py @@ -9,8 +9,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.origin_post_quantum_encryption import ( +from cloudflare.types.origin_post_quantum_encryption.origin_post_quantum_encryption_get_response import ( OriginPostQuantumEncryptionGetResponse, +) +from cloudflare.types.origin_post_quantum_encryption.origin_post_quantum_encryption_update_response import ( OriginPostQuantumEncryptionUpdateResponse, ) diff --git a/tests/api_resources/test_origin_tls_client_auth.py b/tests/api_resources/test_origin_tls_client_auth.py index 04089145986..7e98d804bb6 100644 --- a/tests/api_resources/test_origin_tls_client_auth.py +++ b/tests/api_resources/test_origin_tls_client_auth.py @@ -10,10 +10,12 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.origin_tls_client_auth import ( - ZoneAuthenticatedOriginPull, - OriginTLSClientAuthGetResponse, +from cloudflare.types.origin_tls_client_auth.zone_authenticated_origin_pull import ZoneAuthenticatedOriginPull +from cloudflare.types.origin_tls_client_auth.origin_tls_client_auth_get_response import OriginTLSClientAuthGetResponse +from cloudflare.types.origin_tls_client_auth.origin_tls_client_auth_create_response import ( OriginTLSClientAuthCreateResponse, +) +from cloudflare.types.origin_tls_client_auth.origin_tls_client_auth_delete_response import ( OriginTLSClientAuthDeleteResponse, ) diff --git a/tests/api_resources/test_page_shield.py b/tests/api_resources/test_page_shield.py index d8460c4c9e2..49a129e9177 100644 --- a/tests/api_resources/test_page_shield.py +++ b/tests/api_resources/test_page_shield.py @@ -9,7 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.page_shield import Setting, PageShieldUpdateResponse +from cloudflare.types.page_shield.setting import Setting +from cloudflare.types.page_shield.page_shield_update_response import PageShieldUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_pagerules.py b/tests/api_resources/test_pagerules.py index b665a87ea0e..6e18728f43e 100644 --- a/tests/api_resources/test_pagerules.py +++ b/tests/api_resources/test_pagerules.py @@ -9,14 +9,12 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.pagerules import ( - PageruleGetResponse, - PageruleEditResponse, - PageruleListResponse, - PageruleCreateResponse, - PageruleDeleteResponse, - PageruleUpdateResponse, -) +from cloudflare.types.pagerules.pagerule_get_response import PageruleGetResponse +from cloudflare.types.pagerules.pagerule_edit_response import PageruleEditResponse +from cloudflare.types.pagerules.pagerule_list_response import PageruleListResponse +from cloudflare.types.pagerules.pagerule_create_response import PageruleCreateResponse +from cloudflare.types.pagerules.pagerule_delete_response import PageruleDeleteResponse +from cloudflare.types.pagerules.pagerule_update_response import PageruleUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_pcaps.py b/tests/api_resources/test_pcaps.py index 712c52bdcde..13dd094bf71 100644 --- a/tests/api_resources/test_pcaps.py +++ b/tests/api_resources/test_pcaps.py @@ -10,7 +10,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.pcaps import PCAPGetResponse, PCAPListResponse, PCAPCreateResponse +from cloudflare.types.pcaps.pcap_get_response import PCAPGetResponse +from cloudflare.types.pcaps.pcap_list_response import PCAPListResponse +from cloudflare.types.pcaps.pcap_create_response import PCAPCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_plans.py b/tests/api_resources/test_plans.py index 69ea76c8e6e..48423bb43e1 100644 --- a/tests/api_resources/test_plans.py +++ b/tests/api_resources/test_plans.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.plans import AvailableRatePlan +from cloudflare.types.plans.available_rate_plan import AvailableRatePlan base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_queues.py b/tests/api_resources/test_queues.py index b5d74febfc7..6080c4a15dd 100644 --- a/tests/api_resources/test_queues.py +++ b/tests/api_resources/test_queues.py @@ -10,12 +10,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.queues import ( - Queue, - QueueCreated, - QueueUpdated, - QueueDeleteResponse, -) +from cloudflare.types.queues.queue import Queue +from cloudflare.types.queues.queue_created import QueueCreated +from cloudflare.types.queues.queue_updated import QueueUpdated +from cloudflare.types.queues.queue_delete_response import QueueDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_rate_limits.py b/tests/api_resources/test_rate_limits.py index 67e2f73ad79..1b462297bb4 100644 --- a/tests/api_resources/test_rate_limits.py +++ b/tests/api_resources/test_rate_limits.py @@ -10,13 +10,11 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.rate_limits import ( - RateLimit, - RateLimitGetResponse, - RateLimitEditResponse, - RateLimitCreateResponse, - RateLimitDeleteResponse, -) +from cloudflare.types.rate_limits.rate_limit import RateLimit +from cloudflare.types.rate_limits.rate_limit_get_response import RateLimitGetResponse +from cloudflare.types.rate_limits.rate_limit_edit_response import RateLimitEditResponse +from cloudflare.types.rate_limits.rate_limit_create_response import RateLimitCreateResponse +from cloudflare.types.rate_limits.rate_limit_delete_response import RateLimitDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_rate_plans.py b/tests/api_resources/test_rate_plans.py index c237fc40ca1..23955bcb03f 100644 --- a/tests/api_resources/test_rate_plans.py +++ b/tests/api_resources/test_rate_plans.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.rate_plans import RatePlanGetResponse +from cloudflare.types.rate_plans.rate_plan_get_response import RatePlanGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_rulesets.py b/tests/api_resources/test_rulesets.py index 695ae120700..b949d47af75 100644 --- a/tests/api_resources/test_rulesets.py +++ b/tests/api_resources/test_rulesets.py @@ -10,12 +10,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.rulesets import ( - Ruleset, - RulesetGetResponse, - RulesetCreateResponse, - RulesetUpdateResponse, -) +from cloudflare.types.rulesets.ruleset import Ruleset +from cloudflare.types.rulesets.ruleset_get_response import RulesetGetResponse +from cloudflare.types.rulesets.ruleset_create_response import RulesetCreateResponse +from cloudflare.types.rulesets.ruleset_update_response import RulesetUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_snippets.py b/tests/api_resources/test_snippets.py index c50daf3c503..687cda032c0 100644 --- a/tests/api_resources/test_snippets.py +++ b/tests/api_resources/test_snippets.py @@ -10,7 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.snippets import Snippet, SnippetDeleteResponse +from cloudflare.types.snippets.snippet import Snippet +from cloudflare.types.snippets.snippet_delete_response import SnippetDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_speed.py b/tests/api_resources/test_speed.py index 4b3081ae272..219140f913c 100644 --- a/tests/api_resources/test_speed.py +++ b/tests/api_resources/test_speed.py @@ -10,11 +10,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.speed import ( - Trend, - Schedule, - SpeedDeleteResponse, -) +from cloudflare.types.speed.trend import Trend +from cloudflare.types.speed.schedule import Schedule +from cloudflare.types.speed.speed_delete_response import SpeedDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_stream.py b/tests/api_resources/test_stream.py index 97f94254e43..df25de66aae 100644 --- a/tests/api_resources/test_stream.py +++ b/tests/api_resources/test_stream.py @@ -11,7 +11,7 @@ from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.stream import Video +from cloudflare.types.stream.video import Video base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_subscriptions.py b/tests/api_resources/test_subscriptions.py index 8ed827eede8..d0d2c1d2eb1 100644 --- a/tests/api_resources/test_subscriptions.py +++ b/tests/api_resources/test_subscriptions.py @@ -10,13 +10,11 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.user import Subscription -from cloudflare.types.subscriptions import ( - SubscriptionGetResponse, - SubscriptionCreateResponse, - SubscriptionDeleteResponse, - SubscriptionUpdateResponse, -) +from cloudflare.types.user.subscription import Subscription +from cloudflare.types.subscriptions.subscription_get_response import SubscriptionGetResponse +from cloudflare.types.subscriptions.subscription_create_response import SubscriptionCreateResponse +from cloudflare.types.subscriptions.subscription_delete_response import SubscriptionDeleteResponse +from cloudflare.types.subscriptions.subscription_update_response import SubscriptionUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_url_normalization.py b/tests/api_resources/test_url_normalization.py index 8cc032ab3e1..fb9e08f1bc5 100644 --- a/tests/api_resources/test_url_normalization.py +++ b/tests/api_resources/test_url_normalization.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.url_normalization import ( - URLNormalizationGetResponse, - URLNormalizationUpdateResponse, -) +from cloudflare.types.url_normalization.url_normalization_get_response import URLNormalizationGetResponse +from cloudflare.types.url_normalization.url_normalization_update_response import URLNormalizationUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_url_scanner.py b/tests/api_resources/test_url_scanner.py index edfb0767105..2c9ca0c4e1c 100644 --- a/tests/api_resources/test_url_scanner.py +++ b/tests/api_resources/test_url_scanner.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime -from cloudflare.types.url_scanner import URLScannerScanResponse +from cloudflare.types.url_scanner.url_scanner_scan_response import URLScannerScanResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_user.py b/tests/api_resources/test_user.py index 9207b88ab67..a0177d27b31 100644 --- a/tests/api_resources/test_user.py +++ b/tests/api_resources/test_user.py @@ -9,7 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.user import UserGetResponse, UserEditResponse +from cloudflare.types.user.user_get_response import UserGetResponse +from cloudflare.types.user.user_edit_response import UserEditResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_waiting_rooms.py b/tests/api_resources/test_waiting_rooms.py index e8958b282f2..3ea7e7ca327 100644 --- a/tests/api_resources/test_waiting_rooms.py +++ b/tests/api_resources/test_waiting_rooms.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.waiting_rooms import ( - WaitingRoom, - WaitingRoomDeleteResponse, -) +from cloudflare.types.waiting_rooms.waiting_room import WaitingRoom +from cloudflare.types.waiting_rooms.waiting_room_delete_response import WaitingRoomDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_warp_connector.py b/tests/api_resources/test_warp_connector.py index 4a4eb24fc85..a239db28f3b 100644 --- a/tests/api_resources/test_warp_connector.py +++ b/tests/api_resources/test_warp_connector.py @@ -11,14 +11,12 @@ from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.warp_connector import ( - WARPConnectorGetResponse, - WARPConnectorEditResponse, - WARPConnectorListResponse, - WARPConnectorTokenResponse, - WARPConnectorCreateResponse, - WARPConnectorDeleteResponse, -) +from cloudflare.types.warp_connector.warp_connector_get_response import WARPConnectorGetResponse +from cloudflare.types.warp_connector.warp_connector_edit_response import WARPConnectorEditResponse +from cloudflare.types.warp_connector.warp_connector_list_response import WARPConnectorListResponse +from cloudflare.types.warp_connector.warp_connector_token_response import WARPConnectorTokenResponse +from cloudflare.types.warp_connector.warp_connector_create_response import WARPConnectorCreateResponse +from cloudflare.types.warp_connector.warp_connector_delete_response import WARPConnectorDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/test_zones.py b/tests/api_resources/test_zones.py index 4e5a3fad6d3..71c8435ad40 100644 --- a/tests/api_resources/test_zones.py +++ b/tests/api_resources/test_zones.py @@ -10,7 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.zones import Zone, ZoneDeleteResponse +from cloudflare.types.zones.zone import Zone +from cloudflare.types.zones.zone_delete_response import ZoneDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/url_scanner/test_scans.py b/tests/api_resources/url_scanner/test_scans.py index d0e817fddf5..720e7e936b7 100644 --- a/tests/api_resources/url_scanner/test_scans.py +++ b/tests/api_resources/url_scanner/test_scans.py @@ -17,11 +17,9 @@ StreamedBinaryAPIResponse, AsyncStreamedBinaryAPIResponse, ) -from cloudflare.types.url_scanner import ( - ScanGetResponse, - ScanHarResponse, - ScanCreateResponse, -) +from cloudflare.types.url_scanner.scan_get_response import ScanGetResponse +from cloudflare.types.url_scanner.scan_har_response import ScanHarResponse +from cloudflare.types.url_scanner.scan_create_response import ScanCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/user/billing/test_history.py b/tests/api_resources/user/billing/test_history.py index d16cf7ce228..ec9b3cd5e2f 100644 --- a/tests/api_resources/user/billing/test_history.py +++ b/tests/api_resources/user/billing/test_history.py @@ -11,7 +11,7 @@ from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.user.billing import BillingHistory +from cloudflare.types.user.billing.billing_history import BillingHistory base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/user/billing/test_profile.py b/tests/api_resources/user/billing/test_profile.py index fdeecb4384e..ad5eea8b0c2 100644 --- a/tests/api_resources/user/billing/test_profile.py +++ b/tests/api_resources/user/billing/test_profile.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.user.billing import ProfileGetResponse +from cloudflare.types.user.billing.profile_get_response import ProfileGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/user/test_audit_logs.py b/tests/api_resources/user/test_audit_logs.py index 991015f606d..9e0cc79a68c 100644 --- a/tests/api_resources/user/test_audit_logs.py +++ b/tests/api_resources/user/test_audit_logs.py @@ -11,7 +11,7 @@ from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.shared import AuditLog +from cloudflare.types.shared.audit_log import AuditLog base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/user/test_invites.py b/tests/api_resources/user/test_invites.py index 0236e4db1f9..c188cf81082 100644 --- a/tests/api_resources/user/test_invites.py +++ b/tests/api_resources/user/test_invites.py @@ -10,7 +10,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.user import Invite, InviteGetResponse, InviteEditResponse +from cloudflare.types.user.invite import Invite +from cloudflare.types.user.invite_get_response import InviteGetResponse +from cloudflare.types.user.invite_edit_response import InviteEditResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/user/test_organizations.py b/tests/api_resources/user/test_organizations.py index 9d3593991ee..0745c8cd46f 100644 --- a/tests/api_resources/user/test_organizations.py +++ b/tests/api_resources/user/test_organizations.py @@ -10,11 +10,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.user import ( - Organization, - OrganizationGetResponse, - OrganizationDeleteResponse, -) +from cloudflare.types.user.organization import Organization +from cloudflare.types.user.organization_get_response import OrganizationGetResponse +from cloudflare.types.user.organization_delete_response import OrganizationDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/user/test_subscriptions.py b/tests/api_resources/user/test_subscriptions.py index 68f8a80684d..1cd6b742671 100644 --- a/tests/api_resources/user/test_subscriptions.py +++ b/tests/api_resources/user/test_subscriptions.py @@ -9,12 +9,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.user import ( - SubscriptionGetResponse, - SubscriptionEditResponse, - SubscriptionDeleteResponse, - SubscriptionUpdateResponse, -) +from cloudflare.types.user.subscription_get_response import SubscriptionGetResponse +from cloudflare.types.user.subscription_edit_response import SubscriptionEditResponse +from cloudflare.types.user.subscription_delete_response import SubscriptionDeleteResponse +from cloudflare.types.user.subscription_update_response import SubscriptionUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/user/test_tokens.py b/tests/api_resources/user/test_tokens.py index 69ffa843fff..42faf189580 100644 --- a/tests/api_resources/user/test_tokens.py +++ b/tests/api_resources/user/test_tokens.py @@ -11,13 +11,11 @@ from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.user import ( - TokenGetResponse, - TokenCreateResponse, - TokenDeleteResponse, - TokenUpdateResponse, - TokenVerifyResponse, -) +from cloudflare.types.user.token_get_response import TokenGetResponse +from cloudflare.types.user.token_create_response import TokenCreateResponse +from cloudflare.types.user.token_delete_response import TokenDeleteResponse +from cloudflare.types.user.token_update_response import TokenUpdateResponse +from cloudflare.types.user.token_verify_response import TokenVerifyResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/vectorize/test_indexes.py b/tests/api_resources/vectorize/test_indexes.py index 5b7bccfe4cf..2ede6c609fd 100644 --- a/tests/api_resources/vectorize/test_indexes.py +++ b/tests/api_resources/vectorize/test_indexes.py @@ -10,14 +10,12 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.vectorize import ( - IndexQuery, - CreateIndex, - IndexInsert, - IndexUpsert, - IndexDeleteResponse, - IndexDeleteVectorsByID, -) +from cloudflare.types.vectorize.index_query import IndexQuery +from cloudflare.types.vectorize.create_index import CreateIndex +from cloudflare.types.vectorize.index_insert import IndexInsert +from cloudflare.types.vectorize.index_upsert import IndexUpsert +from cloudflare.types.vectorize.index_delete_response import IndexDeleteResponse +from cloudflare.types.vectorize.index_delete_vectors_by_id import IndexDeleteVectorsByID base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/waiting_rooms/events/test_details.py b/tests/api_resources/waiting_rooms/events/test_details.py index 6620e7a7cfb..8d9a4fbf531 100644 --- a/tests/api_resources/waiting_rooms/events/test_details.py +++ b/tests/api_resources/waiting_rooms/events/test_details.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.waiting_rooms.events import DetailGetResponse +from cloudflare.types.waiting_rooms.events.detail_get_response import DetailGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/waiting_rooms/test_events.py b/tests/api_resources/waiting_rooms/test_events.py index ef7836c59d5..901ca61d711 100644 --- a/tests/api_resources/waiting_rooms/test_events.py +++ b/tests/api_resources/waiting_rooms/test_events.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.waiting_rooms import ( - Event, - EventDeleteResponse, -) +from cloudflare.types.waiting_rooms.event import Event +from cloudflare.types.waiting_rooms.event_delete_response import EventDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/waiting_rooms/test_page.py b/tests/api_resources/waiting_rooms/test_page.py index 8d847225b73..ead6c6eff3a 100644 --- a/tests/api_resources/waiting_rooms/test_page.py +++ b/tests/api_resources/waiting_rooms/test_page.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.waiting_rooms import PagePreviewResponse +from cloudflare.types.waiting_rooms.page_preview_response import PagePreviewResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/waiting_rooms/test_rules.py b/tests/api_resources/waiting_rooms/test_rules.py index 72a6abdb2e7..fa27b73753a 100644 --- a/tests/api_resources/waiting_rooms/test_rules.py +++ b/tests/api_resources/waiting_rooms/test_rules.py @@ -10,13 +10,11 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.waiting_rooms import ( - WaitingRoomRule, - RuleEditResponse, - RuleCreateResponse, - RuleDeleteResponse, - RuleUpdateResponse, -) +from cloudflare.types.waiting_rooms.waiting_room_rule import WaitingRoomRule +from cloudflare.types.waiting_rooms.rule_edit_response import RuleEditResponse +from cloudflare.types.waiting_rooms.rule_create_response import RuleCreateResponse +from cloudflare.types.waiting_rooms.rule_delete_response import RuleDeleteResponse +from cloudflare.types.waiting_rooms.rule_update_response import RuleUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/waiting_rooms/test_settings.py b/tests/api_resources/waiting_rooms/test_settings.py index 79ca12bd88b..3dd457a6ed5 100644 --- a/tests/api_resources/waiting_rooms/test_settings.py +++ b/tests/api_resources/waiting_rooms/test_settings.py @@ -9,11 +9,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.waiting_rooms import ( - SettingGetResponse, - SettingEditResponse, - SettingUpdateResponse, -) +from cloudflare.types.waiting_rooms.setting_get_response import SettingGetResponse +from cloudflare.types.waiting_rooms.setting_edit_response import SettingEditResponse +from cloudflare.types.waiting_rooms.setting_update_response import SettingUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/waiting_rooms/test_statuses.py b/tests/api_resources/waiting_rooms/test_statuses.py index e1d2176da62..43709499dee 100644 --- a/tests/api_resources/waiting_rooms/test_statuses.py +++ b/tests/api_resources/waiting_rooms/test_statuses.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.waiting_rooms import StatusGetResponse +from cloudflare.types.waiting_rooms.status_get_response import StatusGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/web3/hostnames/ipfs_universal_paths/content_lists/test_entries.py b/tests/api_resources/web3/hostnames/ipfs_universal_paths/content_lists/test_entries.py index a908abdd86d..56f419d6fc7 100644 --- a/tests/api_resources/web3/hostnames/ipfs_universal_paths/content_lists/test_entries.py +++ b/tests/api_resources/web3/hostnames/ipfs_universal_paths/content_lists/test_entries.py @@ -9,13 +9,11 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.web3.hostnames.ipfs_universal_paths.content_lists import ( - EntryGetResponse, - EntryListResponse, - EntryCreateResponse, - EntryDeleteResponse, - EntryUpdateResponse, -) +from cloudflare.types.web3.hostnames.ipfs_universal_paths.content_lists.entry_get_response import EntryGetResponse +from cloudflare.types.web3.hostnames.ipfs_universal_paths.content_lists.entry_list_response import EntryListResponse +from cloudflare.types.web3.hostnames.ipfs_universal_paths.content_lists.entry_create_response import EntryCreateResponse +from cloudflare.types.web3.hostnames.ipfs_universal_paths.content_lists.entry_delete_response import EntryDeleteResponse +from cloudflare.types.web3.hostnames.ipfs_universal_paths.content_lists.entry_update_response import EntryUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/web3/hostnames/ipfs_universal_paths/test_content_lists.py b/tests/api_resources/web3/hostnames/ipfs_universal_paths/test_content_lists.py index e2aa0af76c8..b0be6a6b877 100644 --- a/tests/api_resources/web3/hostnames/ipfs_universal_paths/test_content_lists.py +++ b/tests/api_resources/web3/hostnames/ipfs_universal_paths/test_content_lists.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.web3.hostnames.ipfs_universal_paths import ContentList +from cloudflare.types.web3.hostnames.ipfs_universal_paths.content_list import ContentList base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/web3/test_hostnames.py b/tests/api_resources/web3/test_hostnames.py index 9520c176edb..2a66e443c93 100644 --- a/tests/api_resources/web3/test_hostnames.py +++ b/tests/api_resources/web3/test_hostnames.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.web3 import ( - Hostname, - HostnameDeleteResponse, -) +from cloudflare.types.web3.hostname import Hostname +from cloudflare.types.web3.hostname_delete_response import HostnameDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/workers/scripts/test_content.py b/tests/api_resources/workers/scripts/test_content.py index c0e7fa824ca..7ace8aa2329 100644 --- a/tests/api_resources/workers/scripts/test_content.py +++ b/tests/api_resources/workers/scripts/test_content.py @@ -17,7 +17,7 @@ StreamedBinaryAPIResponse, AsyncStreamedBinaryAPIResponse, ) -from cloudflare.types.workers import Script +from cloudflare.types.workers.script import Script base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/workers/scripts/test_deployments.py b/tests/api_resources/workers/scripts/test_deployments.py index 0ec9ea4f121..e28875a538e 100644 --- a/tests/api_resources/workers/scripts/test_deployments.py +++ b/tests/api_resources/workers/scripts/test_deployments.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.workers.scripts import ( - DeploymentGetResponse, - DeploymentCreateResponse, -) +from cloudflare.types.workers.scripts.deployment_get_response import DeploymentGetResponse +from cloudflare.types.workers.scripts.deployment_create_response import DeploymentCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/workers/scripts/test_schedules.py b/tests/api_resources/workers/scripts/test_schedules.py index 46d790e89cd..819dd9d202d 100644 --- a/tests/api_resources/workers/scripts/test_schedules.py +++ b/tests/api_resources/workers/scripts/test_schedules.py @@ -9,7 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.workers.scripts import ScheduleGetResponse, ScheduleUpdateResponse +from cloudflare.types.workers.scripts.schedule_get_response import ScheduleGetResponse +from cloudflare.types.workers.scripts.schedule_update_response import ScheduleUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/workers/scripts/test_settings.py b/tests/api_resources/workers/scripts/test_settings.py index 18af0318652..82e55e0a563 100644 --- a/tests/api_resources/workers/scripts/test_settings.py +++ b/tests/api_resources/workers/scripts/test_settings.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.workers import ScriptSetting +from cloudflare.types.workers.script_setting import ScriptSetting base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/workers/scripts/test_tail.py b/tests/api_resources/workers/scripts/test_tail.py index b03902ca689..9088693f5b9 100644 --- a/tests/api_resources/workers/scripts/test_tail.py +++ b/tests/api_resources/workers/scripts/test_tail.py @@ -9,11 +9,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.workers.scripts import ( - TailGetResponse, - TailCreateResponse, - TailDeleteResponse, -) +from cloudflare.types.workers.scripts.tail_get_response import TailGetResponse +from cloudflare.types.workers.scripts.tail_create_response import TailCreateResponse +from cloudflare.types.workers.scripts.tail_delete_response import TailDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/workers/scripts/test_versions.py b/tests/api_resources/workers/scripts/test_versions.py index a7df8e4fead..428b8e53911 100644 --- a/tests/api_resources/workers/scripts/test_versions.py +++ b/tests/api_resources/workers/scripts/test_versions.py @@ -9,11 +9,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.workers.scripts import ( - VersionGetResponse, - VersionListResponse, - VersionCreateResponse, -) +from cloudflare.types.workers.scripts.version_get_response import VersionGetResponse +from cloudflare.types.workers.scripts.version_list_response import VersionListResponse +from cloudflare.types.workers.scripts.version_create_response import VersionCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/workers/test_account_settings.py b/tests/api_resources/workers/test_account_settings.py index e4a4dfdba55..a50f539dd43 100644 --- a/tests/api_resources/workers/test_account_settings.py +++ b/tests/api_resources/workers/test_account_settings.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.workers import ( - AccountSettingGetResponse, - AccountSettingUpdateResponse, -) +from cloudflare.types.workers.account_setting_get_response import AccountSettingGetResponse +from cloudflare.types.workers.account_setting_update_response import AccountSettingUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/workers/test_ai.py b/tests/api_resources/workers/test_ai.py index 9b149b9f72b..0958f116c5b 100644 --- a/tests/api_resources/workers/test_ai.py +++ b/tests/api_resources/workers/test_ai.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.workers import AIRunResponse +from cloudflare.types.workers.ai_run_response import AIRunResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/workers/test_domains.py b/tests/api_resources/workers/test_domains.py index ddd9b6b4616..040392d1008 100644 --- a/tests/api_resources/workers/test_domains.py +++ b/tests/api_resources/workers/test_domains.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.workers import Domain +from cloudflare.types.workers.domain import Domain base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/workers/test_scripts.py b/tests/api_resources/workers/test_scripts.py index 37653e7083c..64fb9e37a6a 100644 --- a/tests/api_resources/workers/test_scripts.py +++ b/tests/api_resources/workers/test_scripts.py @@ -18,7 +18,7 @@ AsyncStreamedBinaryAPIResponse, ) from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.workers import Script +from cloudflare.types.workers.script import Script base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/workers/test_subdomains.py b/tests/api_resources/workers/test_subdomains.py index 03efd638828..b695557c469 100644 --- a/tests/api_resources/workers/test_subdomains.py +++ b/tests/api_resources/workers/test_subdomains.py @@ -9,7 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.workers import SubdomainGetResponse, SubdomainUpdateResponse +from cloudflare.types.workers.subdomain_get_response import SubdomainGetResponse +from cloudflare.types.workers.subdomain_update_response import SubdomainUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_bindings.py b/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_bindings.py index a5e2e126fec..0b7b218871d 100644 --- a/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_bindings.py +++ b/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_bindings.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.workers_for_platforms.dispatch.namespaces.scripts import BindingGetResponse +from cloudflare.types.workers_for_platforms.dispatch.namespaces.scripts.binding_get_response import BindingGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_content.py b/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_content.py index 6c1374dca41..40d878f790d 100644 --- a/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_content.py +++ b/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_content.py @@ -17,7 +17,7 @@ StreamedBinaryAPIResponse, AsyncStreamedBinaryAPIResponse, ) -from cloudflare.types.workers import Script +from cloudflare.types.workers.script import Script base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_secrets.py b/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_secrets.py index 80ca972e5f3..a268b18bd51 100644 --- a/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_secrets.py +++ b/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_secrets.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.workers_for_platforms.dispatch.namespaces.scripts import ( - SecretListResponse, +from cloudflare.types.workers_for_platforms.dispatch.namespaces.scripts.secret_list_response import SecretListResponse +from cloudflare.types.workers_for_platforms.dispatch.namespaces.scripts.secret_update_response import ( SecretUpdateResponse, ) diff --git a/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_settings.py b/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_settings.py index 64f27b5f64b..227235e8b47 100644 --- a/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_settings.py +++ b/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_settings.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.workers_for_platforms.dispatch.namespaces.scripts import ( - SettingGetResponse, - SettingEditResponse, -) +from cloudflare.types.workers_for_platforms.dispatch.namespaces.scripts.setting_get_response import SettingGetResponse +from cloudflare.types.workers_for_platforms.dispatch.namespaces.scripts.setting_edit_response import SettingEditResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_tags.py b/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_tags.py index a273f1b53b0..7b6b13efd80 100644 --- a/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_tags.py +++ b/tests/api_resources/workers_for_platforms/dispatch/namespaces/scripts/test_tags.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.workers_for_platforms.dispatch.namespaces.scripts import ( - TagListResponse, - TagUpdateResponse, -) +from cloudflare.types.workers_for_platforms.dispatch.namespaces.scripts.tag_list_response import TagListResponse +from cloudflare.types.workers_for_platforms.dispatch.namespaces.scripts.tag_update_response import TagUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/workers_for_platforms/dispatch/namespaces/test_scripts.py b/tests/api_resources/workers_for_platforms/dispatch/namespaces/test_scripts.py index cc10a096022..b9d28ce6a0d 100644 --- a/tests/api_resources/workers_for_platforms/dispatch/namespaces/test_scripts.py +++ b/tests/api_resources/workers_for_platforms/dispatch/namespaces/test_scripts.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.workers import Script -from cloudflare.types.workers_for_platforms.dispatch.namespaces import ( - Script, -) +from cloudflare.types.workers.script import Script as WorkersScript +from cloudflare.types.workers_for_platforms.dispatch.namespaces.script import Script as NamespacesScript base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -28,7 +26,7 @@ def test_method_update_overload_1(self, client: Cloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", dispatch_namespace="my-dispatch-namespace", ) - assert_matches_type(Optional[Script], script, path=["response"]) + assert_matches_type(Optional[WorkersScript], script, path=["response"]) @pytest.mark.skip() @parametrize @@ -112,7 +110,7 @@ def test_method_update_with_all_params_overload_1(self, client: Cloudflare) -> N "version_tags": {}, }, ) - assert_matches_type(Optional[Script], script, path=["response"]) + assert_matches_type(Optional[WorkersScript], script, path=["response"]) @pytest.mark.skip() @parametrize @@ -126,7 +124,7 @@ def test_raw_response_update_overload_1(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" script = response.parse() - assert_matches_type(Optional[Script], script, path=["response"]) + assert_matches_type(Optional[WorkersScript], script, path=["response"]) @pytest.mark.skip() @parametrize @@ -140,7 +138,7 @@ def test_streaming_response_update_overload_1(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" script = response.parse() - assert_matches_type(Optional[Script], script, path=["response"]) + assert_matches_type(Optional[WorkersScript], script, path=["response"]) assert cast(Any, response.is_closed) is True @@ -176,7 +174,7 @@ def test_method_update_overload_2(self, client: Cloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", dispatch_namespace="my-dispatch-namespace", ) - assert_matches_type(Optional[Script], script, path=["response"]) + assert_matches_type(Optional[WorkersScript], script, path=["response"]) @pytest.mark.skip() @parametrize @@ -187,7 +185,7 @@ def test_method_update_with_all_params_overload_2(self, client: Cloudflare) -> N dispatch_namespace="my-dispatch-namespace", message="string", ) - assert_matches_type(Optional[Script], script, path=["response"]) + assert_matches_type(Optional[WorkersScript], script, path=["response"]) @pytest.mark.skip() @parametrize @@ -201,7 +199,7 @@ def test_raw_response_update_overload_2(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" script = response.parse() - assert_matches_type(Optional[Script], script, path=["response"]) + assert_matches_type(Optional[WorkersScript], script, path=["response"]) @pytest.mark.skip() @parametrize @@ -215,7 +213,7 @@ def test_streaming_response_update_overload_2(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" script = response.parse() - assert_matches_type(Optional[Script], script, path=["response"]) + assert_matches_type(Optional[WorkersScript], script, path=["response"]) assert cast(Any, response.is_closed) is True @@ -333,7 +331,7 @@ def test_method_get(self, client: Cloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", dispatch_namespace="my-dispatch-namespace", ) - assert_matches_type(Optional[Script], script, path=["response"]) + assert_matches_type(Optional[NamespacesScript], script, path=["response"]) @pytest.mark.skip() @parametrize @@ -347,7 +345,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" script = response.parse() - assert_matches_type(Optional[Script], script, path=["response"]) + assert_matches_type(Optional[NamespacesScript], script, path=["response"]) @pytest.mark.skip() @parametrize @@ -361,7 +359,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" script = response.parse() - assert_matches_type(Optional[Script], script, path=["response"]) + assert_matches_type(Optional[NamespacesScript], script, path=["response"]) assert cast(Any, response.is_closed) is True @@ -401,7 +399,7 @@ async def test_method_update_overload_1(self, async_client: AsyncCloudflare) -> account_id="023e105f4ecef8ad9ca31a8372d0c353", dispatch_namespace="my-dispatch-namespace", ) - assert_matches_type(Optional[Script], script, path=["response"]) + assert_matches_type(Optional[WorkersScript], script, path=["response"]) @pytest.mark.skip() @parametrize @@ -485,7 +483,7 @@ async def test_method_update_with_all_params_overload_1(self, async_client: Asyn "version_tags": {}, }, ) - assert_matches_type(Optional[Script], script, path=["response"]) + assert_matches_type(Optional[WorkersScript], script, path=["response"]) @pytest.mark.skip() @parametrize @@ -499,7 +497,7 @@ async def test_raw_response_update_overload_1(self, async_client: AsyncCloudflar assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" script = await response.parse() - assert_matches_type(Optional[Script], script, path=["response"]) + assert_matches_type(Optional[WorkersScript], script, path=["response"]) @pytest.mark.skip() @parametrize @@ -513,7 +511,7 @@ async def test_streaming_response_update_overload_1(self, async_client: AsyncClo assert response.http_request.headers.get("X-Stainless-Lang") == "python" script = await response.parse() - assert_matches_type(Optional[Script], script, path=["response"]) + assert_matches_type(Optional[WorkersScript], script, path=["response"]) assert cast(Any, response.is_closed) is True @@ -549,7 +547,7 @@ async def test_method_update_overload_2(self, async_client: AsyncCloudflare) -> account_id="023e105f4ecef8ad9ca31a8372d0c353", dispatch_namespace="my-dispatch-namespace", ) - assert_matches_type(Optional[Script], script, path=["response"]) + assert_matches_type(Optional[WorkersScript], script, path=["response"]) @pytest.mark.skip() @parametrize @@ -560,7 +558,7 @@ async def test_method_update_with_all_params_overload_2(self, async_client: Asyn dispatch_namespace="my-dispatch-namespace", message="string", ) - assert_matches_type(Optional[Script], script, path=["response"]) + assert_matches_type(Optional[WorkersScript], script, path=["response"]) @pytest.mark.skip() @parametrize @@ -574,7 +572,7 @@ async def test_raw_response_update_overload_2(self, async_client: AsyncCloudflar assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" script = await response.parse() - assert_matches_type(Optional[Script], script, path=["response"]) + assert_matches_type(Optional[WorkersScript], script, path=["response"]) @pytest.mark.skip() @parametrize @@ -588,7 +586,7 @@ async def test_streaming_response_update_overload_2(self, async_client: AsyncClo assert response.http_request.headers.get("X-Stainless-Lang") == "python" script = await response.parse() - assert_matches_type(Optional[Script], script, path=["response"]) + assert_matches_type(Optional[WorkersScript], script, path=["response"]) assert cast(Any, response.is_closed) is True @@ -706,7 +704,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", dispatch_namespace="my-dispatch-namespace", ) - assert_matches_type(Optional[Script], script, path=["response"]) + assert_matches_type(Optional[NamespacesScript], script, path=["response"]) @pytest.mark.skip() @parametrize @@ -720,7 +718,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" script = await response.parse() - assert_matches_type(Optional[Script], script, path=["response"]) + assert_matches_type(Optional[NamespacesScript], script, path=["response"]) @pytest.mark.skip() @parametrize @@ -734,7 +732,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No assert response.http_request.headers.get("X-Stainless-Lang") == "python" script = await response.parse() - assert_matches_type(Optional[Script], script, path=["response"]) + assert_matches_type(Optional[NamespacesScript], script, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/workers_for_platforms/dispatch/test_namespaces.py b/tests/api_resources/workers_for_platforms/dispatch/test_namespaces.py index 11cc9e441f7..d5eb35b1ce4 100644 --- a/tests/api_resources/workers_for_platforms/dispatch/test_namespaces.py +++ b/tests/api_resources/workers_for_platforms/dispatch/test_namespaces.py @@ -10,11 +10,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.workers_for_platforms.dispatch import ( - NamespaceGetResponse, - NamespaceListResponse, - NamespaceCreateResponse, -) +from cloudflare.types.workers_for_platforms.dispatch.namespace_get_response import NamespaceGetResponse +from cloudflare.types.workers_for_platforms.dispatch.namespace_list_response import NamespaceListResponse +from cloudflare.types.workers_for_platforms.dispatch.namespace_create_response import NamespaceCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/access/applications/test_cas.py b/tests/api_resources/zero_trust/access/applications/test_cas.py index 5c53d2c5059..810d4b337a2 100644 --- a/tests/api_resources/zero_trust/access/applications/test_cas.py +++ b/tests/api_resources/zero_trust/access/applications/test_cas.py @@ -10,7 +10,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.access.applications import CA, CAGetResponse, CACreateResponse, CADeleteResponse +from cloudflare.types.zero_trust.access.applications.ca import CA +from cloudflare.types.zero_trust.access.applications.ca_get_response import CAGetResponse +from cloudflare.types.zero_trust.access.applications.ca_create_response import CACreateResponse +from cloudflare.types.zero_trust.access.applications.ca_delete_response import CADeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/access/applications/test_policies.py b/tests/api_resources/zero_trust/access/applications/test_policies.py index 5a7734e8d07..29c70fa87cf 100644 --- a/tests/api_resources/zero_trust/access/applications/test_policies.py +++ b/tests/api_resources/zero_trust/access/applications/test_policies.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.access.applications import ( - Policy, - PolicyDeleteResponse, -) +from cloudflare.types.zero_trust.access.applications.policy import Policy +from cloudflare.types.zero_trust.access.applications.policy_delete_response import PolicyDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/access/applications/test_user_policy_checks.py b/tests/api_resources/zero_trust/access/applications/test_user_policy_checks.py index 9072d96c0c2..5cd0fdf9dde 100644 --- a/tests/api_resources/zero_trust/access/applications/test_user_policy_checks.py +++ b/tests/api_resources/zero_trust/access/applications/test_user_policy_checks.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.access.applications import UserPolicyCheckListResponse +from cloudflare.types.zero_trust.access.applications.user_policy_check_list_response import UserPolicyCheckListResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/access/certificates/test_settings.py b/tests/api_resources/zero_trust/access/certificates/test_settings.py index 112ab10b6e4..755db1f1b4f 100644 --- a/tests/api_resources/zero_trust/access/certificates/test_settings.py +++ b/tests/api_resources/zero_trust/access/certificates/test_settings.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.access.certificates import ( - SettingGetResponse, - SettingUpdateResponse, -) +from cloudflare.types.zero_trust.access.certificates.setting_get_response import SettingGetResponse +from cloudflare.types.zero_trust.access.certificates.setting_update_response import SettingUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/access/logs/test_access_requests.py b/tests/api_resources/zero_trust/access/logs/test_access_requests.py index 411964d255b..0f06c8982ef 100644 --- a/tests/api_resources/zero_trust/access/logs/test_access_requests.py +++ b/tests/api_resources/zero_trust/access/logs/test_access_requests.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.access.logs import AccessRequestListResponse +from cloudflare.types.zero_trust.access.logs.access_request_list_response import AccessRequestListResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/access/test_applications.py b/tests/api_resources/zero_trust/access/test_applications.py index d2557b97cde..9d22888966a 100644 --- a/tests/api_resources/zero_trust/access/test_applications.py +++ b/tests/api_resources/zero_trust/access/test_applications.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.access import ( - Application, - ApplicationDeleteResponse, -) +from cloudflare.types.zero_trust.access.application import Application +from cloudflare.types.zero_trust.access.application_delete_response import ApplicationDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/access/test_bookmarks.py b/tests/api_resources/zero_trust/access/test_bookmarks.py index 957fb0357e3..0c40732bd39 100644 --- a/tests/api_resources/zero_trust/access/test_bookmarks.py +++ b/tests/api_resources/zero_trust/access/test_bookmarks.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.access import ( - Bookmark, - BookmarkDeleteResponse, -) +from cloudflare.types.zero_trust.access.bookmark import Bookmark +from cloudflare.types.zero_trust.access.bookmark_delete_response import BookmarkDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/access/test_certificates.py b/tests/api_resources/zero_trust/access/test_certificates.py index c91be3d7a8c..dd00efffe9e 100644 --- a/tests/api_resources/zero_trust/access/test_certificates.py +++ b/tests/api_resources/zero_trust/access/test_certificates.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.access import ( - Certificate, - CertificateDeleteResponse, -) +from cloudflare.types.zero_trust.access.certificate import Certificate +from cloudflare.types.zero_trust.access.certificate_delete_response import CertificateDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/access/test_custom_pages.py b/tests/api_resources/zero_trust/access/test_custom_pages.py index e308329aad0..42205be72fe 100644 --- a/tests/api_resources/zero_trust/access/test_custom_pages.py +++ b/tests/api_resources/zero_trust/access/test_custom_pages.py @@ -10,11 +10,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.access import ( - CustomPage, - CustomPageWithoutHTML, - CustomPageDeleteResponse, -) +from cloudflare.types.zero_trust.access.custom_page import CustomPage +from cloudflare.types.zero_trust.access.custom_page_without_html import CustomPageWithoutHTML +from cloudflare.types.zero_trust.access.custom_page_delete_response import CustomPageDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/access/test_groups.py b/tests/api_resources/zero_trust/access/test_groups.py index 4d3955c56ee..4c55c3fca81 100644 --- a/tests/api_resources/zero_trust/access/test_groups.py +++ b/tests/api_resources/zero_trust/access/test_groups.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.access import ( - ZeroTrustGroup, - GroupDeleteResponse, -) +from cloudflare.types.zero_trust.access.zero_trust_group import ZeroTrustGroup +from cloudflare.types.zero_trust.access.group_delete_response import GroupDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/access/test_keys.py b/tests/api_resources/zero_trust/access/test_keys.py index 24d3a034147..6b2ebb382a8 100644 --- a/tests/api_resources/zero_trust/access/test_keys.py +++ b/tests/api_resources/zero_trust/access/test_keys.py @@ -9,7 +9,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.access import KeyGetResponse, KeyRotateResponse, KeyUpdateResponse +from cloudflare.types.zero_trust.access.key_get_response import KeyGetResponse +from cloudflare.types.zero_trust.access.key_rotate_response import KeyRotateResponse +from cloudflare.types.zero_trust.access.key_update_response import KeyUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/access/test_service_tokens.py b/tests/api_resources/zero_trust/access/test_service_tokens.py index ef3affbf96c..b35650734ab 100644 --- a/tests/api_resources/zero_trust/access/test_service_tokens.py +++ b/tests/api_resources/zero_trust/access/test_service_tokens.py @@ -10,11 +10,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.access import ( - ServiceToken, - ServiceTokenCreateResponse, - ServiceTokenRotateResponse, -) +from cloudflare.types.zero_trust.access.service_token import ServiceToken +from cloudflare.types.zero_trust.access.service_token_create_response import ServiceTokenCreateResponse +from cloudflare.types.zero_trust.access.service_token_rotate_response import ServiceTokenRotateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/access/test_tags.py b/tests/api_resources/zero_trust/access/test_tags.py index f2a936811e9..0f7d13bba95 100644 --- a/tests/api_resources/zero_trust/access/test_tags.py +++ b/tests/api_resources/zero_trust/access/test_tags.py @@ -10,7 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.access import Tag, TagDeleteResponse +from cloudflare.types.zero_trust.access.tag import Tag +from cloudflare.types.zero_trust.access.tag_delete_response import TagDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/access/test_users.py b/tests/api_resources/zero_trust/access/test_users.py index 15052076003..91e89a0c449 100644 --- a/tests/api_resources/zero_trust/access/test_users.py +++ b/tests/api_resources/zero_trust/access/test_users.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.access import AccessUser +from cloudflare.types.zero_trust.access.access_user import AccessUser base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/access/users/test_active_sessions.py b/tests/api_resources/zero_trust/access/users/test_active_sessions.py index c8013d80274..8c769851b4b 100644 --- a/tests/api_resources/zero_trust/access/users/test_active_sessions.py +++ b/tests/api_resources/zero_trust/access/users/test_active_sessions.py @@ -10,7 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.access.users import ActiveSessionGetResponse, ActiveSessionListResponse +from cloudflare.types.zero_trust.access.users.active_session_get_response import ActiveSessionGetResponse +from cloudflare.types.zero_trust.access.users.active_session_list_response import ActiveSessionListResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/access/users/test_failed_logins.py b/tests/api_resources/zero_trust/access/users/test_failed_logins.py index 34259b8225d..dbecf1080b5 100644 --- a/tests/api_resources/zero_trust/access/users/test_failed_logins.py +++ b/tests/api_resources/zero_trust/access/users/test_failed_logins.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.access.users import FailedLoginListResponse +from cloudflare.types.zero_trust.access.users.failed_login_list_response import FailedLoginListResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/access/users/test_last_seen_identity.py b/tests/api_resources/zero_trust/access/users/test_last_seen_identity.py index 9b2f3fa96c4..14ec1729a0f 100644 --- a/tests/api_resources/zero_trust/access/users/test_last_seen_identity.py +++ b/tests/api_resources/zero_trust/access/users/test_last_seen_identity.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.access.users import Identity +from cloudflare.types.zero_trust.access.users.identity import Identity base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/devices/policies/test_default_policy.py b/tests/api_resources/zero_trust/devices/policies/test_default_policy.py index 2257cd23f41..de33297f451 100644 --- a/tests/api_resources/zero_trust/devices/policies/test_default_policy.py +++ b/tests/api_resources/zero_trust/devices/policies/test_default_policy.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.devices.policies import DefaultPolicyGetResponse +from cloudflare.types.zero_trust.devices.policies.default_policy_get_response import DefaultPolicyGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/devices/policies/test_excludes.py b/tests/api_resources/zero_trust/devices/policies/test_excludes.py index fbdb2969e2c..8f08940c2de 100644 --- a/tests/api_resources/zero_trust/devices/policies/test_excludes.py +++ b/tests/api_resources/zero_trust/devices/policies/test_excludes.py @@ -10,11 +10,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.devices.policies import ( - ExcludeGetResponse, - SplitTunnelExclude, - ExcludeUpdateResponse, -) +from cloudflare.types.zero_trust.devices.policies.exclude_get_response import ExcludeGetResponse +from cloudflare.types.zero_trust.devices.policies.split_tunnel_exclude import SplitTunnelExclude +from cloudflare.types.zero_trust.devices.policies.exclude_update_response import ExcludeUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/devices/policies/test_fallback_domains.py b/tests/api_resources/zero_trust/devices/policies/test_fallback_domains.py index c23935cc023..f5482786d61 100644 --- a/tests/api_resources/zero_trust/devices/policies/test_fallback_domains.py +++ b/tests/api_resources/zero_trust/devices/policies/test_fallback_domains.py @@ -10,11 +10,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.devices.policies import ( - FallbackDomain, - FallbackDomainGetResponse, - FallbackDomainUpdateResponse, -) +from cloudflare.types.zero_trust.devices.policies.fallback_domain import FallbackDomain +from cloudflare.types.zero_trust.devices.policies.fallback_domain_get_response import FallbackDomainGetResponse +from cloudflare.types.zero_trust.devices.policies.fallback_domain_update_response import FallbackDomainUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/devices/policies/test_includes.py b/tests/api_resources/zero_trust/devices/policies/test_includes.py index d17008e0558..26b065c0f39 100644 --- a/tests/api_resources/zero_trust/devices/policies/test_includes.py +++ b/tests/api_resources/zero_trust/devices/policies/test_includes.py @@ -10,11 +10,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.devices.policies import ( - IncludeGetResponse, - SplitTunnelInclude, - IncludeUpdateResponse, -) +from cloudflare.types.zero_trust.devices.policies.include_get_response import IncludeGetResponse +from cloudflare.types.zero_trust.devices.policies.split_tunnel_include import SplitTunnelInclude +from cloudflare.types.zero_trust.devices.policies.include_update_response import IncludeUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/devices/posture/test_integrations.py b/tests/api_resources/zero_trust/devices/posture/test_integrations.py index febee75d18a..25043b98783 100644 --- a/tests/api_resources/zero_trust/devices/posture/test_integrations.py +++ b/tests/api_resources/zero_trust/devices/posture/test_integrations.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.devices.posture import ( - Integration, - IntegrationDeleteResponse, -) +from cloudflare.types.zero_trust.devices.posture.integration import Integration +from cloudflare.types.zero_trust.devices.posture.integration_delete_response import IntegrationDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/devices/test_dex_tests.py b/tests/api_resources/zero_trust/devices/test_dex_tests.py index 67f1de6d899..32788a4a1d0 100644 --- a/tests/api_resources/zero_trust/devices/test_dex_tests.py +++ b/tests/api_resources/zero_trust/devices/test_dex_tests.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.devices import ( - SchemaHTTP, - DEXTestDeleteResponse, -) +from cloudflare.types.zero_trust.devices.schema_http import SchemaHTTP +from cloudflare.types.zero_trust.devices.dex_test_delete_response import DEXTestDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/devices/test_networks.py b/tests/api_resources/zero_trust/devices/test_networks.py index 945e63aff1f..30701ddf3ff 100644 --- a/tests/api_resources/zero_trust/devices/test_networks.py +++ b/tests/api_resources/zero_trust/devices/test_networks.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.devices import ( - DeviceNetwork, - NetworkDeleteResponse, -) +from cloudflare.types.zero_trust.devices.device_network import DeviceNetwork +from cloudflare.types.zero_trust.devices.network_delete_response import NetworkDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/devices/test_override_codes.py b/tests/api_resources/zero_trust/devices/test_override_codes.py index dd12c6a6af2..fe5f06f0744 100644 --- a/tests/api_resources/zero_trust/devices/test_override_codes.py +++ b/tests/api_resources/zero_trust/devices/test_override_codes.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.devices import OverrideCodeListResponse +from cloudflare.types.zero_trust.devices.override_code_list_response import OverrideCodeListResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/devices/test_policies.py b/tests/api_resources/zero_trust/devices/test_policies.py index 8400c293aa1..af7e8c718c5 100644 --- a/tests/api_resources/zero_trust/devices/test_policies.py +++ b/tests/api_resources/zero_trust/devices/test_policies.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.devices import ( - SettingsPolicy, - PolicyDeleteResponse, -) +from cloudflare.types.zero_trust.devices.settings_policy import SettingsPolicy +from cloudflare.types.zero_trust.devices.policy_delete_response import PolicyDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/devices/test_posture.py b/tests/api_resources/zero_trust/devices/test_posture.py index dd5f8e84962..6fa27d73207 100644 --- a/tests/api_resources/zero_trust/devices/test_posture.py +++ b/tests/api_resources/zero_trust/devices/test_posture.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.devices import ( - DevicePostureRule, - PostureDeleteResponse, -) +from cloudflare.types.zero_trust.devices.device_posture_rule import DevicePostureRule +from cloudflare.types.zero_trust.devices.posture_delete_response import PostureDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/devices/test_revoke.py b/tests/api_resources/zero_trust/devices/test_revoke.py index 450ed115f7a..0809adcd5b0 100644 --- a/tests/api_resources/zero_trust/devices/test_revoke.py +++ b/tests/api_resources/zero_trust/devices/test_revoke.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.devices import RevokeCreateResponse +from cloudflare.types.zero_trust.devices.revoke_create_response import RevokeCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/devices/test_settings.py b/tests/api_resources/zero_trust/devices/test_settings.py index 4223ebeeecb..4ce4bb96e6b 100644 --- a/tests/api_resources/zero_trust/devices/test_settings.py +++ b/tests/api_resources/zero_trust/devices/test_settings.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.devices import DeviceSettings +from cloudflare.types.zero_trust.devices.device_settings import DeviceSettings base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/devices/test_unrevoke.py b/tests/api_resources/zero_trust/devices/test_unrevoke.py index 1734c9f55fd..488d82eca21 100644 --- a/tests/api_resources/zero_trust/devices/test_unrevoke.py +++ b/tests/api_resources/zero_trust/devices/test_unrevoke.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.devices import UnrevokeCreateResponse +from cloudflare.types.zero_trust.devices.unrevoke_create_response import UnrevokeCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/dex/fleet_status/test_devices.py b/tests/api_resources/zero_trust/dex/fleet_status/test_devices.py index 6c300ed53f7..4ce0b0c2511 100644 --- a/tests/api_resources/zero_trust/dex/fleet_status/test_devices.py +++ b/tests/api_resources/zero_trust/dex/fleet_status/test_devices.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.zero_trust.dex.fleet_status import DeviceListResponse +from cloudflare.types.zero_trust.dex.fleet_status.device_list_response import DeviceListResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/dex/http_tests/test_percentiles.py b/tests/api_resources/zero_trust/dex/http_tests/test_percentiles.py index 44f1f6f210b..e74e9c6070c 100644 --- a/tests/api_resources/zero_trust/dex/http_tests/test_percentiles.py +++ b/tests/api_resources/zero_trust/dex/http_tests/test_percentiles.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.dex.http_tests import HTTPDetailsPercentiles +from cloudflare.types.zero_trust.dex.http_tests.http_details_percentiles import HTTPDetailsPercentiles base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/dex/test_fleet_status.py b/tests/api_resources/zero_trust/dex/test_fleet_status.py index 0a360ca83d5..1712bcb2669 100644 --- a/tests/api_resources/zero_trust/dex/test_fleet_status.py +++ b/tests/api_resources/zero_trust/dex/test_fleet_status.py @@ -9,9 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.dex import ( - FleetStatusLiveResponse, -) +from cloudflare.types.zero_trust.dex.fleet_status_live_response import FleetStatusLiveResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/dex/test_http_tests.py b/tests/api_resources/zero_trust/dex/test_http_tests.py index 1bee3b8453a..0b852d34967 100644 --- a/tests/api_resources/zero_trust/dex/test_http_tests.py +++ b/tests/api_resources/zero_trust/dex/test_http_tests.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.dex import HTTPDetails +from cloudflare.types.zero_trust.dex.http_details import HTTPDetails base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/dex/test_tests.py b/tests/api_resources/zero_trust/dex/test_tests.py index 654803068c2..4b1bd5ec38f 100644 --- a/tests/api_resources/zero_trust/dex/test_tests.py +++ b/tests/api_resources/zero_trust/dex/test_tests.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncV4PagePagination, AsyncV4PagePagination -from cloudflare.types.zero_trust.dex import TestListResponse +from cloudflare.types.zero_trust.dex.test_list_response import TestListResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/dex/test_traceroute_tests.py b/tests/api_resources/zero_trust/dex/test_traceroute_tests.py index ee3c35fe683..ea3673d3c1e 100644 --- a/tests/api_resources/zero_trust/dex/test_traceroute_tests.py +++ b/tests/api_resources/zero_trust/dex/test_traceroute_tests.py @@ -9,11 +9,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust import NetworkPathResponse -from cloudflare.types.zero_trust.dex import ( - Traceroute, - TracerouteTestPercentilesResponse, -) +from cloudflare.types.zero_trust.dex.traceroute import Traceroute +from cloudflare.types.zero_trust.network_path_response import NetworkPathResponse +from cloudflare.types.zero_trust.dex.traceroute_test_percentiles_response import TracerouteTestPercentilesResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/dex/tests/test_unique_devices.py b/tests/api_resources/zero_trust/dex/tests/test_unique_devices.py index 219371cebd9..182a51a8a51 100644 --- a/tests/api_resources/zero_trust/dex/tests/test_unique_devices.py +++ b/tests/api_resources/zero_trust/dex/tests/test_unique_devices.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.dex.tests import UniqueDevices +from cloudflare.types.zero_trust.dex.tests.unique_devices import UniqueDevices base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/dex/traceroute_test_results/test_network_path.py b/tests/api_resources/zero_trust/dex/traceroute_test_results/test_network_path.py index a0b19f6c881..d9f51e98cfe 100644 --- a/tests/api_resources/zero_trust/dex/traceroute_test_results/test_network_path.py +++ b/tests/api_resources/zero_trust/dex/traceroute_test_results/test_network_path.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.dex.traceroute_test_results import NetworkPathGetResponse +from cloudflare.types.zero_trust.dex.traceroute_test_results.network_path_get_response import NetworkPathGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/dlp/datasets/test_upload.py b/tests/api_resources/zero_trust/dlp/datasets/test_upload.py index 073f054e469..4664f9456fb 100644 --- a/tests/api_resources/zero_trust/dlp/datasets/test_upload.py +++ b/tests/api_resources/zero_trust/dlp/datasets/test_upload.py @@ -9,8 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.dlp import Dataset -from cloudflare.types.zero_trust.dlp.datasets import NewVersion +from cloudflare.types.zero_trust.dlp.dataset import Dataset +from cloudflare.types.zero_trust.dlp.datasets.new_version import NewVersion base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/dlp/profiles/test_custom.py b/tests/api_resources/zero_trust/dlp/profiles/test_custom.py index 7645cc81700..e0ca3b9e2da 100644 --- a/tests/api_resources/zero_trust/dlp/profiles/test_custom.py +++ b/tests/api_resources/zero_trust/dlp/profiles/test_custom.py @@ -9,11 +9,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.dlp.profiles import ( - CustomProfile, - CustomCreateResponse, - CustomDeleteResponse, -) +from cloudflare.types.zero_trust.dlp.profiles.custom_profile import CustomProfile +from cloudflare.types.zero_trust.dlp.profiles.custom_create_response import CustomCreateResponse +from cloudflare.types.zero_trust.dlp.profiles.custom_delete_response import CustomDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/dlp/profiles/test_predefined.py b/tests/api_resources/zero_trust/dlp/profiles/test_predefined.py index 42c8f7812ac..85a2e4248c7 100644 --- a/tests/api_resources/zero_trust/dlp/profiles/test_predefined.py +++ b/tests/api_resources/zero_trust/dlp/profiles/test_predefined.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.dlp.profiles import PredefinedProfile +from cloudflare.types.zero_trust.dlp.profiles.predefined_profile import PredefinedProfile base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/dlp/test_datasets.py b/tests/api_resources/zero_trust/dlp/test_datasets.py index c6a79798a4d..59f4bdb519f 100644 --- a/tests/api_resources/zero_trust/dlp/test_datasets.py +++ b/tests/api_resources/zero_trust/dlp/test_datasets.py @@ -10,7 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.dlp import Dataset, DatasetCreation +from cloudflare.types.zero_trust.dlp.dataset import Dataset +from cloudflare.types.zero_trust.dlp.dataset_creation import DatasetCreation base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/dlp/test_patterns.py b/tests/api_resources/zero_trust/dlp/test_patterns.py index 4f3c0ded98d..8f2493a8767 100644 --- a/tests/api_resources/zero_trust/dlp/test_patterns.py +++ b/tests/api_resources/zero_trust/dlp/test_patterns.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.logpush import OwnershipValidation +from cloudflare.types.logpush.ownership_validation import OwnershipValidation base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/dlp/test_payload_logs.py b/tests/api_resources/zero_trust/dlp/test_payload_logs.py index 0f18a2aa45e..10b34cadfef 100644 --- a/tests/api_resources/zero_trust/dlp/test_payload_logs.py +++ b/tests/api_resources/zero_trust/dlp/test_payload_logs.py @@ -9,7 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.dlp import PayloadLogGetResponse, PayloadLogUpdateResponse +from cloudflare.types.zero_trust.dlp.payload_log_get_response import PayloadLogGetResponse +from cloudflare.types.zero_trust.dlp.payload_log_update_response import PayloadLogUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/dlp/test_profiles.py b/tests/api_resources/zero_trust/dlp/test_profiles.py index c373f9035ff..a4f33dc2987 100644 --- a/tests/api_resources/zero_trust/dlp/test_profiles.py +++ b/tests/api_resources/zero_trust/dlp/test_profiles.py @@ -10,7 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.dlp import Profile, ProfileGetResponse +from cloudflare.types.zero_trust.dlp.profile import Profile +from cloudflare.types.zero_trust.dlp.profile_get_response import ProfileGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/gateway/lists/test_items.py b/tests/api_resources/zero_trust/gateway/lists/test_items.py index e16f44bd1ce..468ec04bab5 100644 --- a/tests/api_resources/zero_trust/gateway/lists/test_items.py +++ b/tests/api_resources/zero_trust/gateway/lists/test_items.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.gateway.lists import ItemListResponse +from cloudflare.types.zero_trust.gateway.lists.item_list_response import ItemListResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/gateway/test_app_types.py b/tests/api_resources/zero_trust/gateway/test_app_types.py index 73e3cc10608..50cdc7d5443 100644 --- a/tests/api_resources/zero_trust/gateway/test_app_types.py +++ b/tests/api_resources/zero_trust/gateway/test_app_types.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.gateway import AppType +from cloudflare.types.zero_trust.gateway.app_type import AppType base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/gateway/test_audit_ssh_settings.py b/tests/api_resources/zero_trust/gateway/test_audit_ssh_settings.py index 46d1d9b060b..dfff2c64800 100644 --- a/tests/api_resources/zero_trust/gateway/test_audit_ssh_settings.py +++ b/tests/api_resources/zero_trust/gateway/test_audit_ssh_settings.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.gateway import GatewaySettings +from cloudflare.types.zero_trust.gateway.gateway_settings import GatewaySettings base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/gateway/test_categories.py b/tests/api_resources/zero_trust/gateway/test_categories.py index 1ec3c2e3886..493145345f8 100644 --- a/tests/api_resources/zero_trust/gateway/test_categories.py +++ b/tests/api_resources/zero_trust/gateway/test_categories.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.gateway import Category +from cloudflare.types.zero_trust.gateway.category import Category base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/gateway/test_configurations.py b/tests/api_resources/zero_trust/gateway/test_configurations.py index 49df85907e5..fdb2189a5ed 100644 --- a/tests/api_resources/zero_trust/gateway/test_configurations.py +++ b/tests/api_resources/zero_trust/gateway/test_configurations.py @@ -9,11 +9,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.gateway import ( - ConfigurationGetResponse, - ConfigurationEditResponse, - ConfigurationUpdateResponse, -) +from cloudflare.types.zero_trust.gateway.configuration_get_response import ConfigurationGetResponse +from cloudflare.types.zero_trust.gateway.configuration_edit_response import ConfigurationEditResponse +from cloudflare.types.zero_trust.gateway.configuration_update_response import ConfigurationUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/gateway/test_lists.py b/tests/api_resources/zero_trust/gateway/test_lists.py index 1170b57052c..7881181bdad 100644 --- a/tests/api_resources/zero_trust/gateway/test_lists.py +++ b/tests/api_resources/zero_trust/gateway/test_lists.py @@ -10,11 +10,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.gateway import ( - GatewayList, - ListCreateResponse, - ListDeleteResponse, -) +from cloudflare.types.zero_trust.gateway.gateway_list import GatewayList +from cloudflare.types.zero_trust.gateway.list_create_response import ListCreateResponse +from cloudflare.types.zero_trust.gateway.list_delete_response import ListDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/gateway/test_locations.py b/tests/api_resources/zero_trust/gateway/test_locations.py index e7aec2ed604..4049a984b30 100644 --- a/tests/api_resources/zero_trust/gateway/test_locations.py +++ b/tests/api_resources/zero_trust/gateway/test_locations.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.gateway import ( - Location, - LocationDeleteResponse, -) +from cloudflare.types.zero_trust.gateway.location import Location +from cloudflare.types.zero_trust.gateway.location_delete_response import LocationDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/gateway/test_logging.py b/tests/api_resources/zero_trust/gateway/test_logging.py index 3fb8cdc6e28..456b0289c8b 100644 --- a/tests/api_resources/zero_trust/gateway/test_logging.py +++ b/tests/api_resources/zero_trust/gateway/test_logging.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.gateway import LoggingSetting +from cloudflare.types.zero_trust.gateway.logging_setting import LoggingSetting base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/gateway/test_proxy_endpoints.py b/tests/api_resources/zero_trust/gateway/test_proxy_endpoints.py index 8637beea073..ebc9df85eb6 100644 --- a/tests/api_resources/zero_trust/gateway/test_proxy_endpoints.py +++ b/tests/api_resources/zero_trust/gateway/test_proxy_endpoints.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.gateway import ( - ProxyEndpoint, - ProxyEndpointDeleteResponse, -) +from cloudflare.types.zero_trust.gateway.proxy_endpoint import ProxyEndpoint +from cloudflare.types.zero_trust.gateway.proxy_endpoint_delete_response import ProxyEndpointDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/gateway/test_rules.py b/tests/api_resources/zero_trust/gateway/test_rules.py index b74eda41ab4..06386fffc8a 100644 --- a/tests/api_resources/zero_trust/gateway/test_rules.py +++ b/tests/api_resources/zero_trust/gateway/test_rules.py @@ -10,10 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.gateway import ( - GatewayRule, - RuleDeleteResponse, -) +from cloudflare.types.zero_trust.gateway.gateway_rule import GatewayRule +from cloudflare.types.zero_trust.gateway.rule_delete_response import RuleDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/networks/routes/test_ips.py b/tests/api_resources/zero_trust/networks/routes/test_ips.py index 855684c7b80..a9e502c1168 100644 --- a/tests/api_resources/zero_trust/networks/routes/test_ips.py +++ b/tests/api_resources/zero_trust/networks/routes/test_ips.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.networks import Teamnet +from cloudflare.types.zero_trust.networks.teamnet import Teamnet base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/networks/routes/test_networks.py b/tests/api_resources/zero_trust/networks/routes/test_networks.py index 954d3bfed6f..080b8b57b6b 100644 --- a/tests/api_resources/zero_trust/networks/routes/test_networks.py +++ b/tests/api_resources/zero_trust/networks/routes/test_networks.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.networks import Route +from cloudflare.types.zero_trust.networks.route import Route base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/networks/test_routes.py b/tests/api_resources/zero_trust/networks/test_routes.py index c788dc68199..ce54749d1d8 100644 --- a/tests/api_resources/zero_trust/networks/test_routes.py +++ b/tests/api_resources/zero_trust/networks/test_routes.py @@ -11,10 +11,8 @@ from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.zero_trust.networks import ( - Route, - Teamnet, -) +from cloudflare.types.zero_trust.networks.route import Route +from cloudflare.types.zero_trust.networks.teamnet import Teamnet base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/networks/test_virtual_networks.py b/tests/api_resources/zero_trust/networks/test_virtual_networks.py index 823898d7d15..0605b0ea6c5 100644 --- a/tests/api_resources/zero_trust/networks/test_virtual_networks.py +++ b/tests/api_resources/zero_trust/networks/test_virtual_networks.py @@ -10,12 +10,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.networks import ( - VirtualNetwork, - VirtualNetworkEditResponse, - VirtualNetworkCreateResponse, - VirtualNetworkDeleteResponse, -) +from cloudflare.types.zero_trust.networks.virtual_network import VirtualNetwork +from cloudflare.types.zero_trust.networks.virtual_network_edit_response import VirtualNetworkEditResponse +from cloudflare.types.zero_trust.networks.virtual_network_create_response import VirtualNetworkCreateResponse +from cloudflare.types.zero_trust.networks.virtual_network_delete_response import VirtualNetworkDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/risk_scoring/test_behaviours.py b/tests/api_resources/zero_trust/risk_scoring/test_behaviours.py index 274bc9a39d4..b3a3f782a81 100644 --- a/tests/api_resources/zero_trust/risk_scoring/test_behaviours.py +++ b/tests/api_resources/zero_trust/risk_scoring/test_behaviours.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.risk_scoring import ( - BehaviourGetResponse, - BehaviourUpdateResponse, -) +from cloudflare.types.zero_trust.risk_scoring.behaviour_get_response import BehaviourGetResponse +from cloudflare.types.zero_trust.risk_scoring.behaviour_update_response import BehaviourUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/risk_scoring/test_summary.py b/tests/api_resources/zero_trust/risk_scoring/test_summary.py index 37e56ed2449..b10f5fe4b9c 100644 --- a/tests/api_resources/zero_trust/risk_scoring/test_summary.py +++ b/tests/api_resources/zero_trust/risk_scoring/test_summary.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.risk_scoring import SummaryGetResponse +from cloudflare.types.zero_trust.risk_scoring.summary_get_response import SummaryGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/test_connectivity_settings.py b/tests/api_resources/zero_trust/test_connectivity_settings.py index 001080cf070..5c129dd44c4 100644 --- a/tests/api_resources/zero_trust/test_connectivity_settings.py +++ b/tests/api_resources/zero_trust/test_connectivity_settings.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust import ( - ConnectivitySettingGetResponse, - ConnectivitySettingEditResponse, -) +from cloudflare.types.zero_trust.connectivity_setting_get_response import ConnectivitySettingGetResponse +from cloudflare.types.zero_trust.connectivity_setting_edit_response import ConnectivitySettingEditResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/test_devices.py b/tests/api_resources/zero_trust/test_devices.py index 1beef070418..9e3bbc48c25 100644 --- a/tests/api_resources/zero_trust/test_devices.py +++ b/tests/api_resources/zero_trust/test_devices.py @@ -10,7 +10,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust import Device, DeviceGetResponse +from cloudflare.types.zero_trust.device import Device +from cloudflare.types.zero_trust.device_get_response import DeviceGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/test_gateway.py b/tests/api_resources/zero_trust/test_gateway.py index 27d4193e48e..9089bb0f26d 100644 --- a/tests/api_resources/zero_trust/test_gateway.py +++ b/tests/api_resources/zero_trust/test_gateway.py @@ -9,7 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust import GatewayListResponse, GatewayCreateResponse +from cloudflare.types.zero_trust.gateway_list_response import GatewayListResponse +from cloudflare.types.zero_trust.gateway_create_response import GatewayCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/test_identity_providers.py b/tests/api_resources/zero_trust/test_identity_providers.py index f9df9404dd2..82ace384f03 100644 --- a/tests/api_resources/zero_trust/test_identity_providers.py +++ b/tests/api_resources/zero_trust/test_identity_providers.py @@ -10,11 +10,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust import ( - IdentityProvider, - IdentityProviderListResponse, - IdentityProviderDeleteResponse, -) +from cloudflare.types.zero_trust.identity_provider import IdentityProvider +from cloudflare.types.zero_trust.identity_provider_list_response import IdentityProviderListResponse +from cloudflare.types.zero_trust.identity_provider_delete_response import IdentityProviderDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/test_organizations.py b/tests/api_resources/zero_trust/test_organizations.py index c8bcc6bb4eb..8610b2484c8 100644 --- a/tests/api_resources/zero_trust/test_organizations.py +++ b/tests/api_resources/zero_trust/test_organizations.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust import ( - Organization, - OrganizationRevokeUsersResponse, -) +from cloudflare.types.zero_trust.organization import Organization +from cloudflare.types.zero_trust.organization_revoke_users_response import OrganizationRevokeUsersResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/test_risk_scoring.py b/tests/api_resources/zero_trust/test_risk_scoring.py index a6b124a3dc7..9211f77cafd 100644 --- a/tests/api_resources/zero_trust/test_risk_scoring.py +++ b/tests/api_resources/zero_trust/test_risk_scoring.py @@ -9,7 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust import RiskScoringGetResponse, RiskScoringResetResponse +from cloudflare.types.zero_trust.risk_scoring_get_response import RiskScoringGetResponse +from cloudflare.types.zero_trust.risk_scoring_reset_response import RiskScoringResetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/test_seats.py b/tests/api_resources/zero_trust/test_seats.py index f1b797fd45a..224caa6609e 100644 --- a/tests/api_resources/zero_trust/test_seats.py +++ b/tests/api_resources/zero_trust/test_seats.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust import SeatEditResponse +from cloudflare.types.zero_trust.seat_edit_response import SeatEditResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/test_tunnels.py b/tests/api_resources/zero_trust/test_tunnels.py index c5198ec7d4c..4a10e8cb8e1 100644 --- a/tests/api_resources/zero_trust/test_tunnels.py +++ b/tests/api_resources/zero_trust/test_tunnels.py @@ -11,13 +11,11 @@ from tests.utils import assert_matches_type from cloudflare._utils import parse_datetime from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from cloudflare.types.zero_trust import ( - TunnelGetResponse, - TunnelEditResponse, - TunnelListResponse, - TunnelCreateResponse, - TunnelDeleteResponse, -) +from cloudflare.types.zero_trust.tunnel_get_response import TunnelGetResponse +from cloudflare.types.zero_trust.tunnel_edit_response import TunnelEditResponse +from cloudflare.types.zero_trust.tunnel_list_response import TunnelListResponse +from cloudflare.types.zero_trust.tunnel_create_response import TunnelCreateResponse +from cloudflare.types.zero_trust.tunnel_delete_response import TunnelDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/tunnels/test_configurations.py b/tests/api_resources/zero_trust/tunnels/test_configurations.py index 13e89aa70ac..b79fa1154ca 100644 --- a/tests/api_resources/zero_trust/tunnels/test_configurations.py +++ b/tests/api_resources/zero_trust/tunnels/test_configurations.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.tunnels import ( - ConfigurationGetResponse, - ConfigurationUpdateResponse, -) +from cloudflare.types.zero_trust.tunnels.configuration_get_response import ConfigurationGetResponse +from cloudflare.types.zero_trust.tunnels.configuration_update_response import ConfigurationUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/tunnels/test_connections.py b/tests/api_resources/zero_trust/tunnels/test_connections.py index d7d2ec576f3..26310f54f50 100644 --- a/tests/api_resources/zero_trust/tunnels/test_connections.py +++ b/tests/api_resources/zero_trust/tunnels/test_connections.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.tunnels import ( - ConnectionGetResponse, - ConnectionDeleteResponse, -) +from cloudflare.types.zero_trust.tunnels.connection_get_response import ConnectionGetResponse +from cloudflare.types.zero_trust.tunnels.connection_delete_response import ConnectionDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/tunnels/test_connectors.py b/tests/api_resources/zero_trust/tunnels/test_connectors.py index 6c9843d9e52..d7932897680 100644 --- a/tests/api_resources/zero_trust/tunnels/test_connectors.py +++ b/tests/api_resources/zero_trust/tunnels/test_connectors.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.tunnels import Client +from cloudflare.types.zero_trust.tunnels.client import Client base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/tunnels/test_management.py b/tests/api_resources/zero_trust/tunnels/test_management.py index 4fe9fafa2bf..7649ed32b24 100644 --- a/tests/api_resources/zero_trust/tunnels/test_management.py +++ b/tests/api_resources/zero_trust/tunnels/test_management.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.tunnels import ManagementCreateResponse +from cloudflare.types.zero_trust.tunnels.management_create_response import ManagementCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zero_trust/tunnels/test_token.py b/tests/api_resources/zero_trust/tunnels/test_token.py index c4535952c3f..e9706ef7ec1 100644 --- a/tests/api_resources/zero_trust/tunnels/test_token.py +++ b/tests/api_resources/zero_trust/tunnels/test_token.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.tunnels import TokenGetResponse +from cloudflare.types.zero_trust.tunnels.token_get_response import TokenGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_advanced_ddos.py b/tests/api_resources/zones/settings/test_advanced_ddos.py index 6866ae5e9fc..fc550681946 100644 --- a/tests/api_resources/zones/settings/test_advanced_ddos.py +++ b/tests/api_resources/zones/settings/test_advanced_ddos.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import AdvancedDDoS +from cloudflare.types.zones.settings.advanced_ddos import AdvancedDDoS base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_always_online.py b/tests/api_resources/zones/settings/test_always_online.py index 8773d50c892..34d3444f3ca 100644 --- a/tests/api_resources/zones/settings/test_always_online.py +++ b/tests/api_resources/zones/settings/test_always_online.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import AlwaysOnline +from cloudflare.types.zones.settings.always_online import AlwaysOnline base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_always_use_https.py b/tests/api_resources/zones/settings/test_always_use_https.py index 31a42cb7de7..b62a3d41140 100644 --- a/tests/api_resources/zones/settings/test_always_use_https.py +++ b/tests/api_resources/zones/settings/test_always_use_https.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import AlwaysUseHTTPS +from cloudflare.types.zones.settings.always_use_https import AlwaysUseHTTPS base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_automatic_https_rewrites.py b/tests/api_resources/zones/settings/test_automatic_https_rewrites.py index 4601468bab3..7eb774fb8d6 100644 --- a/tests/api_resources/zones/settings/test_automatic_https_rewrites.py +++ b/tests/api_resources/zones/settings/test_automatic_https_rewrites.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import AutomaticHTTPSRewrites +from cloudflare.types.zones.settings.automatic_https_rewrites import AutomaticHTTPSRewrites base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_automatic_platform_optimization.py b/tests/api_resources/zones/settings/test_automatic_platform_optimization.py index d9b945e5762..7249757a4c3 100644 --- a/tests/api_resources/zones/settings/test_automatic_platform_optimization.py +++ b/tests/api_resources/zones/settings/test_automatic_platform_optimization.py @@ -10,6 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.types.zones.settings import AutomaticPlatformOptimization +from cloudflare.types.zones.settings.automatic_platform_optimization import AutomaticPlatformOptimization base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_brotli.py b/tests/api_resources/zones/settings/test_brotli.py index 98ac6368896..38e2dec2bd5 100644 --- a/tests/api_resources/zones/settings/test_brotli.py +++ b/tests/api_resources/zones/settings/test_brotli.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import Brotli +from cloudflare.types.zones.settings.brotli import Brotli base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_browser_cache_ttl.py b/tests/api_resources/zones/settings/test_browser_cache_ttl.py index c971841241f..b3cba09de3a 100644 --- a/tests/api_resources/zones/settings/test_browser_cache_ttl.py +++ b/tests/api_resources/zones/settings/test_browser_cache_ttl.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import BrowserCacheTTL +from cloudflare.types.zones.settings.browser_cache_ttl import BrowserCacheTTL base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_browser_check.py b/tests/api_resources/zones/settings/test_browser_check.py index e025959af30..d15b4289cc0 100644 --- a/tests/api_resources/zones/settings/test_browser_check.py +++ b/tests/api_resources/zones/settings/test_browser_check.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import BrowserCheck +from cloudflare.types.zones.settings.browser_check import BrowserCheck base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_cache_level.py b/tests/api_resources/zones/settings/test_cache_level.py index cc8808120e4..e5d8076c2f7 100644 --- a/tests/api_resources/zones/settings/test_cache_level.py +++ b/tests/api_resources/zones/settings/test_cache_level.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import CacheLevel +from cloudflare.types.zones.settings.cache_level import CacheLevel base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_challenge_ttl.py b/tests/api_resources/zones/settings/test_challenge_ttl.py index b5074a454b7..0ce0ad8750f 100644 --- a/tests/api_resources/zones/settings/test_challenge_ttl.py +++ b/tests/api_resources/zones/settings/test_challenge_ttl.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import ChallengeTTL +from cloudflare.types.zones.settings.challenge_ttl import ChallengeTTL base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_ciphers.py b/tests/api_resources/zones/settings/test_ciphers.py index 5faf738d89c..7e309733907 100644 --- a/tests/api_resources/zones/settings/test_ciphers.py +++ b/tests/api_resources/zones/settings/test_ciphers.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import Ciphers +from cloudflare.types.zones.settings.ciphers import Ciphers base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_development_mode.py b/tests/api_resources/zones/settings/test_development_mode.py index 3255e5c314b..dbac3f8bf9b 100644 --- a/tests/api_resources/zones/settings/test_development_mode.py +++ b/tests/api_resources/zones/settings/test_development_mode.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import DevelopmentMode +from cloudflare.types.zones.settings.development_mode import DevelopmentMode base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_early_hints.py b/tests/api_resources/zones/settings/test_early_hints.py index 201428cdcc3..7991d96c9c8 100644 --- a/tests/api_resources/zones/settings/test_early_hints.py +++ b/tests/api_resources/zones/settings/test_early_hints.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import EarlyHints +from cloudflare.types.zones.settings.early_hints import EarlyHints base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_email_obfuscation.py b/tests/api_resources/zones/settings/test_email_obfuscation.py index da0b23d3c3f..386dd32f76d 100644 --- a/tests/api_resources/zones/settings/test_email_obfuscation.py +++ b/tests/api_resources/zones/settings/test_email_obfuscation.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import EmailObfuscation +from cloudflare.types.zones.settings.email_obfuscation import EmailObfuscation base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_font_settings.py b/tests/api_resources/zones/settings/test_font_settings.py index 962ef1d1ef2..4e4a033836a 100644 --- a/tests/api_resources/zones/settings/test_font_settings.py +++ b/tests/api_resources/zones/settings/test_font_settings.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import FontSettings +from cloudflare.types.zones.settings.font_settings import FontSettings base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_h2_prioritization.py b/tests/api_resources/zones/settings/test_h2_prioritization.py index ec70ca9633e..cbd4afc631b 100644 --- a/tests/api_resources/zones/settings/test_h2_prioritization.py +++ b/tests/api_resources/zones/settings/test_h2_prioritization.py @@ -10,6 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.types.zones.settings import H2Prioritization +from cloudflare.types.zones.settings.h2_prioritization import H2Prioritization base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_hotlink_protection.py b/tests/api_resources/zones/settings/test_hotlink_protection.py index 59aafb76c7c..369e33ef10a 100644 --- a/tests/api_resources/zones/settings/test_hotlink_protection.py +++ b/tests/api_resources/zones/settings/test_hotlink_protection.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import HotlinkProtection +from cloudflare.types.zones.settings.hotlink_protection import HotlinkProtection base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_http2.py b/tests/api_resources/zones/settings/test_http2.py index 6a0f922bd20..fad9257b0bd 100644 --- a/tests/api_resources/zones/settings/test_http2.py +++ b/tests/api_resources/zones/settings/test_http2.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import HTTP2 +from cloudflare.types.zones.settings.http2 import HTTP2 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_http3.py b/tests/api_resources/zones/settings/test_http3.py index 258a55d1365..639bb0bbc20 100644 --- a/tests/api_resources/zones/settings/test_http3.py +++ b/tests/api_resources/zones/settings/test_http3.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import HTTP3 +from cloudflare.types.zones.settings.http3 import HTTP3 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_image_resizing.py b/tests/api_resources/zones/settings/test_image_resizing.py index c87a4190713..ff978b988a8 100644 --- a/tests/api_resources/zones/settings/test_image_resizing.py +++ b/tests/api_resources/zones/settings/test_image_resizing.py @@ -10,6 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.types.zones.settings import ImageResizing +from cloudflare.types.zones.settings.image_resizing import ImageResizing base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_ip_geolocation.py b/tests/api_resources/zones/settings/test_ip_geolocation.py index 090494ed084..ecd99d6945b 100644 --- a/tests/api_resources/zones/settings/test_ip_geolocation.py +++ b/tests/api_resources/zones/settings/test_ip_geolocation.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import IPGeolocation +from cloudflare.types.zones.settings.ip_geolocation import IPGeolocation base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_ipv6.py b/tests/api_resources/zones/settings/test_ipv6.py index 9e5c0651d2c..21f94f4fad4 100644 --- a/tests/api_resources/zones/settings/test_ipv6.py +++ b/tests/api_resources/zones/settings/test_ipv6.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import IPV6 +from cloudflare.types.zones.settings.ipv6 import IPV6 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_min_tls_version.py b/tests/api_resources/zones/settings/test_min_tls_version.py index e9667e3d696..ba6a0078318 100644 --- a/tests/api_resources/zones/settings/test_min_tls_version.py +++ b/tests/api_resources/zones/settings/test_min_tls_version.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import MinTLSVersion +from cloudflare.types.zones.settings.min_tls_version import MinTLSVersion base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_minify.py b/tests/api_resources/zones/settings/test_minify.py index fbfdffb16a7..e32be9f8a1d 100644 --- a/tests/api_resources/zones/settings/test_minify.py +++ b/tests/api_resources/zones/settings/test_minify.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import Minify +from cloudflare.types.zones.settings.minify import Minify base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_mirage.py b/tests/api_resources/zones/settings/test_mirage.py index 54af1256547..df7e84f8584 100644 --- a/tests/api_resources/zones/settings/test_mirage.py +++ b/tests/api_resources/zones/settings/test_mirage.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import Mirage +from cloudflare.types.zones.settings.mirage import Mirage base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_mobile_redirect.py b/tests/api_resources/zones/settings/test_mobile_redirect.py index da662f3d23f..5fd6a2731c5 100644 --- a/tests/api_resources/zones/settings/test_mobile_redirect.py +++ b/tests/api_resources/zones/settings/test_mobile_redirect.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import MobileRedirect +from cloudflare.types.zones.settings.mobile_redirect import MobileRedirect base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_nel.py b/tests/api_resources/zones/settings/test_nel.py index 06df1c52474..5879cf8888c 100644 --- a/tests/api_resources/zones/settings/test_nel.py +++ b/tests/api_resources/zones/settings/test_nel.py @@ -10,6 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.types.zones.settings import NEL +from cloudflare.types.zones.settings.nel import NEL base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_opportunistic_encryption.py b/tests/api_resources/zones/settings/test_opportunistic_encryption.py index de0952f3313..ea85bed6d1b 100644 --- a/tests/api_resources/zones/settings/test_opportunistic_encryption.py +++ b/tests/api_resources/zones/settings/test_opportunistic_encryption.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import OpportunisticEncryption +from cloudflare.types.zones.settings.opportunistic_encryption import OpportunisticEncryption base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_opportunistic_onion.py b/tests/api_resources/zones/settings/test_opportunistic_onion.py index 95d177adbc8..2f5e4d340e4 100644 --- a/tests/api_resources/zones/settings/test_opportunistic_onion.py +++ b/tests/api_resources/zones/settings/test_opportunistic_onion.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import OpportunisticOnion +from cloudflare.types.zones.settings.opportunistic_onion import OpportunisticOnion base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_orange_to_orange.py b/tests/api_resources/zones/settings/test_orange_to_orange.py index 641ff393897..77f1b6c0d07 100644 --- a/tests/api_resources/zones/settings/test_orange_to_orange.py +++ b/tests/api_resources/zones/settings/test_orange_to_orange.py @@ -10,6 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.types.zones.settings import OrangeToOrange +from cloudflare.types.zones.settings.orange_to_orange import OrangeToOrange base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_origin_error_page_pass_thru.py b/tests/api_resources/zones/settings/test_origin_error_page_pass_thru.py index 0f8db392e89..5bd6bdfeabd 100644 --- a/tests/api_resources/zones/settings/test_origin_error_page_pass_thru.py +++ b/tests/api_resources/zones/settings/test_origin_error_page_pass_thru.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import OriginErrorPagePassThru +from cloudflare.types.zones.settings.origin_error_page_pass_thru import OriginErrorPagePassThru base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_origin_max_http_version.py b/tests/api_resources/zones/settings/test_origin_max_http_version.py index 68024c905a6..39ddb11a280 100644 --- a/tests/api_resources/zones/settings/test_origin_max_http_version.py +++ b/tests/api_resources/zones/settings/test_origin_max_http_version.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import ( - OriginMaxHTTPVersionGetResponse, - OriginMaxHTTPVersionEditResponse, -) +from cloudflare.types.zones.settings.origin_max_http_version_get_response import OriginMaxHTTPVersionGetResponse +from cloudflare.types.zones.settings.origin_max_http_version_edit_response import OriginMaxHTTPVersionEditResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_polish.py b/tests/api_resources/zones/settings/test_polish.py index e2fc5942cb9..f540a03c5ee 100644 --- a/tests/api_resources/zones/settings/test_polish.py +++ b/tests/api_resources/zones/settings/test_polish.py @@ -10,6 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.types.zones.settings import Polish +from cloudflare.types.zones.settings.polish import Polish base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_prefetch_preload.py b/tests/api_resources/zones/settings/test_prefetch_preload.py index ad818f62ba6..89d23f4f328 100644 --- a/tests/api_resources/zones/settings/test_prefetch_preload.py +++ b/tests/api_resources/zones/settings/test_prefetch_preload.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import PrefetchPreload +from cloudflare.types.zones.settings.prefetch_preload import PrefetchPreload base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_proxy_read_timeout.py b/tests/api_resources/zones/settings/test_proxy_read_timeout.py index 04f4c151d2e..88ccb6cfeac 100644 --- a/tests/api_resources/zones/settings/test_proxy_read_timeout.py +++ b/tests/api_resources/zones/settings/test_proxy_read_timeout.py @@ -10,6 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.types.zones.settings import ProxyReadTimeout +from cloudflare.types.zones.settings.proxy_read_timeout import ProxyReadTimeout base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_pseudo_ipv4.py b/tests/api_resources/zones/settings/test_pseudo_ipv4.py index a777c5c3bd7..3877f9edf90 100644 --- a/tests/api_resources/zones/settings/test_pseudo_ipv4.py +++ b/tests/api_resources/zones/settings/test_pseudo_ipv4.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import PseudoIPV4 +from cloudflare.types.zones.settings.pseudo_ipv4 import PseudoIPV4 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_response_buffering.py b/tests/api_resources/zones/settings/test_response_buffering.py index c41a364275a..254e8ae809e 100644 --- a/tests/api_resources/zones/settings/test_response_buffering.py +++ b/tests/api_resources/zones/settings/test_response_buffering.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import ResponseBuffering +from cloudflare.types.zones.settings.response_buffering import ResponseBuffering base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_rocket_loader.py b/tests/api_resources/zones/settings/test_rocket_loader.py index 353098a9e62..ea7f19e20dc 100644 --- a/tests/api_resources/zones/settings/test_rocket_loader.py +++ b/tests/api_resources/zones/settings/test_rocket_loader.py @@ -10,6 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.types.zones.settings import RocketLoader +from cloudflare.types.zones.settings.rocket_loader import RocketLoader base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_security_headers.py b/tests/api_resources/zones/settings/test_security_headers.py index 48477c873b9..301408e2228 100644 --- a/tests/api_resources/zones/settings/test_security_headers.py +++ b/tests/api_resources/zones/settings/test_security_headers.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import SecurityHeaders +from cloudflare.types.zones.settings.security_headers import SecurityHeaders base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_security_level.py b/tests/api_resources/zones/settings/test_security_level.py index 2ea94451ba1..46a85cf14e7 100644 --- a/tests/api_resources/zones/settings/test_security_level.py +++ b/tests/api_resources/zones/settings/test_security_level.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import SecurityLevel +from cloudflare.types.zones.settings.security_level import SecurityLevel base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_server_side_excludes.py b/tests/api_resources/zones/settings/test_server_side_excludes.py index ee818f4662b..3590c69cbf4 100644 --- a/tests/api_resources/zones/settings/test_server_side_excludes.py +++ b/tests/api_resources/zones/settings/test_server_side_excludes.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import ServerSideExcludes +from cloudflare.types.zones.settings.server_side_excludes import ServerSideExcludes base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_sort_query_string_for_cache.py b/tests/api_resources/zones/settings/test_sort_query_string_for_cache.py index b91c19c9e30..76e531c39bb 100644 --- a/tests/api_resources/zones/settings/test_sort_query_string_for_cache.py +++ b/tests/api_resources/zones/settings/test_sort_query_string_for_cache.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import SortQueryStringForCache +from cloudflare.types.zones.settings.sort_query_string_for_cache import SortQueryStringForCache base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_ssl.py b/tests/api_resources/zones/settings/test_ssl.py index e749d573b71..9bdb64ce54a 100644 --- a/tests/api_resources/zones/settings/test_ssl.py +++ b/tests/api_resources/zones/settings/test_ssl.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import SSL +from cloudflare.types.zones.settings.ssl import SSL base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_ssl_recommender.py b/tests/api_resources/zones/settings/test_ssl_recommender.py index 908b7e922cc..ba3e2259bd9 100644 --- a/tests/api_resources/zones/settings/test_ssl_recommender.py +++ b/tests/api_resources/zones/settings/test_ssl_recommender.py @@ -10,6 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.types.zones.settings import SSLRecommender +from cloudflare.types.zones.settings.ssl_recommender import SSLRecommender base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_tls_1_3.py b/tests/api_resources/zones/settings/test_tls_1_3.py index 439a0d44ddb..feb7cd78fb6 100644 --- a/tests/api_resources/zones/settings/test_tls_1_3.py +++ b/tests/api_resources/zones/settings/test_tls_1_3.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import TLS1_3 +from cloudflare.types.zones.settings.tls_1_3 import TLS1_3 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_tls_client_auth.py b/tests/api_resources/zones/settings/test_tls_client_auth.py index 6f8c2f04967..6e1b075bd04 100644 --- a/tests/api_resources/zones/settings/test_tls_client_auth.py +++ b/tests/api_resources/zones/settings/test_tls_client_auth.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import TLSClientAuth +from cloudflare.types.zones.settings.tls_client_auth import TLSClientAuth base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_true_client_ip_header.py b/tests/api_resources/zones/settings/test_true_client_ip_header.py index ea3d3532e9c..44ceac2ec06 100644 --- a/tests/api_resources/zones/settings/test_true_client_ip_header.py +++ b/tests/api_resources/zones/settings/test_true_client_ip_header.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import TrueClientIPHeader +from cloudflare.types.zones.settings.true_client_ip_header import TrueClientIPHeader base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_waf.py b/tests/api_resources/zones/settings/test_waf.py index 16008e3b625..c66f7baeea2 100644 --- a/tests/api_resources/zones/settings/test_waf.py +++ b/tests/api_resources/zones/settings/test_waf.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import WAF +from cloudflare.types.zones.settings.waf import WAF base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_webp.py b/tests/api_resources/zones/settings/test_webp.py index dfa41054305..88db5d853bb 100644 --- a/tests/api_resources/zones/settings/test_webp.py +++ b/tests/api_resources/zones/settings/test_webp.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import WebP +from cloudflare.types.zones.settings.webp import WebP base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_websocket.py b/tests/api_resources/zones/settings/test_websocket.py index 69d4236b897..17d0a61d126 100644 --- a/tests/api_resources/zones/settings/test_websocket.py +++ b/tests/api_resources/zones/settings/test_websocket.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import Websocket +from cloudflare.types.zones.settings.websocket import Websocket base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/settings/test_zero_rtt.py b/tests/api_resources/zones/settings/test_zero_rtt.py index e2f1c0decff..994e02751b6 100644 --- a/tests/api_resources/zones/settings/test_zero_rtt.py +++ b/tests/api_resources/zones/settings/test_zero_rtt.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones.settings import ZeroRTT +from cloudflare.types.zones.settings.zero_rtt import ZeroRTT base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/test_activation_check.py b/tests/api_resources/zones/test_activation_check.py index 67f56ba83eb..254603ee6fa 100644 --- a/tests/api_resources/zones/test_activation_check.py +++ b/tests/api_resources/zones/test_activation_check.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones import ActivationCheckTriggerResponse +from cloudflare.types.zones.activation_check_trigger_response import ActivationCheckTriggerResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/test_custom_nameservers.py b/tests/api_resources/zones/test_custom_nameservers.py index 0d059a2b75b..11994140148 100644 --- a/tests/api_resources/zones/test_custom_nameservers.py +++ b/tests/api_resources/zones/test_custom_nameservers.py @@ -9,10 +9,8 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones import ( - CustomNameserverGetResponse, - CustomNameserverUpdateResponse, -) +from cloudflare.types.zones.custom_nameserver_get_response import CustomNameserverGetResponse +from cloudflare.types.zones.custom_nameserver_update_response import CustomNameserverUpdateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/test_dns_settings.py b/tests/api_resources/zones/test_dns_settings.py index 8072f04cc44..3bb8a3c71c4 100644 --- a/tests/api_resources/zones/test_dns_settings.py +++ b/tests/api_resources/zones/test_dns_settings.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones import DNSSetting +from cloudflare.types.zones.dns_setting import DNSSetting base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/test_holds.py b/tests/api_resources/zones/test_holds.py index 5c9c3e04182..7ac16346ebb 100644 --- a/tests/api_resources/zones/test_holds.py +++ b/tests/api_resources/zones/test_holds.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zones import ZoneHold +from cloudflare.types.zones.zone_hold import ZoneHold base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") diff --git a/tests/api_resources/zones/test_subscriptions.py b/tests/api_resources/zones/test_subscriptions.py index 7a2c16b5aee..d3ec269a7d8 100644 --- a/tests/api_resources/zones/test_subscriptions.py +++ b/tests/api_resources/zones/test_subscriptions.py @@ -10,8 +10,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.user import Subscription -from cloudflare.types.zones import SubscriptionGetResponse, SubscriptionCreateResponse +from cloudflare.types.user.subscription import Subscription +from cloudflare.types.zones.subscription_get_response import SubscriptionGetResponse +from cloudflare.types.zones.subscription_create_response import SubscriptionCreateResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")