diff --git a/api.md b/api.md
index e0919f4499a..4970e2cf8d0 100644
--- a/api.md
+++ b/api.md
@@ -22,14 +22,19 @@ from cloudflare.types import (
Types:
```python
-from cloudflare.types import Account, AccountUpdateResponse, AccountListResponse, AccountGetResponse
+from cloudflare.types.accounts import (
+ Account,
+ AccountUpdateResponse,
+ AccountListResponse,
+ AccountGetResponse,
+)
```
Methods:
-- client.accounts.update(\*, account_id, \*\*params) -> AccountUpdateResponse
-- client.accounts.list(\*\*params) -> SyncV4PagePaginationArray[object]
-- client.accounts.get(\*, account_id) -> AccountGetResponse
+- client.accounts.update(\*, account_id, \*\*params) -> AccountUpdateResponse
+- client.accounts.list(\*\*params) -> SyncV4PagePaginationArray[object]
+- client.accounts.get(\*, account_id) -> AccountGetResponse
## Members
@@ -65,7 +70,7 @@ Methods:
Types:
```python
-from cloudflare.types import (
+from cloudflare.types.origin_ca_certificates import (
OriginCACertificate,
OriginCACertificateCreateResponse,
OriginCACertificateDeleteResponse,
@@ -75,29 +80,29 @@ from cloudflare.types import (
Methods:
-- client.origin_ca_certificates.create(\*\*params) -> OriginCACertificateCreateResponse
-- client.origin_ca_certificates.list(\*\*params) -> SyncSinglePage[OriginCACertificate]
-- client.origin_ca_certificates.delete(certificate_id, \*\*params) -> OriginCACertificateDeleteResponse
-- client.origin_ca_certificates.get(certificate_id) -> OriginCACertificateGetResponse
+- client.origin_ca_certificates.create(\*\*params) -> OriginCACertificateCreateResponse
+- client.origin_ca_certificates.list(\*\*params) -> SyncSinglePage[OriginCACertificate]
+- client.origin_ca_certificates.delete(certificate_id, \*\*params) -> OriginCACertificateDeleteResponse
+- client.origin_ca_certificates.get(certificate_id) -> OriginCACertificateGetResponse
# IPs
Types:
```python
-from cloudflare.types import IPs, JDCloudIPs, IPListResponse
+from cloudflare.types.ips import IPs, JDCloudIPs, IPListResponse
```
Methods:
-- client.ips.list(\*\*params) -> IPListResponse
+- client.ips.list(\*\*params) -> IPListResponse
# Memberships
Types:
```python
-from cloudflare.types import (
+from cloudflare.types.memberships import (
Membership,
MembershipUpdateResponse,
MembershipDeleteResponse,
@@ -107,23 +112,23 @@ from cloudflare.types import (
Methods:
-- client.memberships.update(membership_id, \*\*params) -> MembershipUpdateResponse
-- client.memberships.list(\*\*params) -> SyncV4PagePaginationArray[Membership]
-- client.memberships.delete(membership_id, \*\*params) -> MembershipDeleteResponse
-- client.memberships.get(membership_id) -> MembershipGetResponse
+- client.memberships.update(membership_id, \*\*params) -> MembershipUpdateResponse
+- client.memberships.list(\*\*params) -> SyncV4PagePaginationArray[Membership]
+- client.memberships.delete(membership_id, \*\*params) -> MembershipDeleteResponse
+- client.memberships.get(membership_id) -> MembershipGetResponse
# User
Types:
```python
-from cloudflare.types import UserEditResponse, UserGetResponse
+from cloudflare.types.user import UserEditResponse, UserGetResponse
```
Methods:
-- client.user.edit(\*\*params) -> UserEditResponse
-- client.user.get() -> UserGetResponse
+- client.user.edit(\*\*params) -> UserEditResponse
+- client.user.get() -> UserGetResponse
## AuditLogs
@@ -265,16 +270,16 @@ Methods:
Types:
```python
-from cloudflare.types import Zone, ZoneDeleteResponse
+from cloudflare.types.zones import Zone, ZoneDeleteResponse
```
Methods:
-- client.zones.create(\*\*params) -> Optional
-- client.zones.list(\*\*params) -> SyncV4PagePaginationArray[Zone]
-- client.zones.delete(\*, zone_id) -> Optional
-- client.zones.edit(\*, zone_id, \*\*params) -> Optional
-- client.zones.get(\*, zone_id) -> Optional
+- client.zones.create(\*\*params) -> Optional
+- client.zones.list(\*\*params) -> SyncV4PagePaginationArray[Zone]
+- client.zones.delete(\*, zone_id) -> Optional
+- client.zones.edit(\*, zone_id, \*\*params) -> Optional
+- client.zones.get(\*, zone_id) -> Optional
## ActivationCheck
@@ -1015,7 +1020,7 @@ Methods:
Types:
```python
-from cloudflare.types import (
+from cloudflare.types.load_balancers import (
AdaptiveRouting,
CheckRegion,
DefaultPools,
@@ -1037,12 +1042,12 @@ from cloudflare.types import (
Methods:
-- client.load_balancers.create(\*, zone_id, \*\*params) -> LoadBalancer
-- client.load_balancers.update(load_balancer_id, \*, zone_id, \*\*params) -> LoadBalancer
-- client.load_balancers.list(\*, zone_id) -> SyncSinglePage[LoadBalancer]
-- client.load_balancers.delete(load_balancer_id, \*, zone_id, \*\*params) -> LoadBalancerDeleteResponse
-- client.load_balancers.edit(load_balancer_id, \*, zone_id, \*\*params) -> LoadBalancer
-- client.load_balancers.get(load_balancer_id, \*, zone_id) -> LoadBalancer
+- client.load_balancers.create(\*, zone_id, \*\*params) -> LoadBalancer
+- client.load_balancers.update(load_balancer_id, \*, zone_id, \*\*params) -> LoadBalancer
+- client.load_balancers.list(\*, zone_id) -> SyncSinglePage[LoadBalancer]
+- client.load_balancers.delete(load_balancer_id, \*, zone_id, \*\*params) -> LoadBalancerDeleteResponse
+- client.load_balancers.edit(load_balancer_id, \*, zone_id, \*\*params) -> LoadBalancer
+- client.load_balancers.get(load_balancer_id, \*, zone_id) -> LoadBalancer
## Monitors
@@ -1169,12 +1174,12 @@ Methods:
Types:
```python
-from cloudflare.types import CachePurgeResponse
+from cloudflare.types.cache import CachePurgeResponse
```
Methods:
-- client.cache.purge(\*, zone_id, \*\*params) -> Optional
+- client.cache.purge(\*, zone_id, \*\*params) -> Optional
## CacheReserveResource
@@ -1356,7 +1361,7 @@ Methods:
Types:
```python
-from cloudflare.types import (
+from cloudflare.types.subscriptions import (
SubscriptionCreateResponse,
SubscriptionUpdateResponse,
SubscriptionDeleteResponse,
@@ -1366,11 +1371,11 @@ from cloudflare.types import (
Methods:
-- client.subscriptions.create(identifier, \*\*params) -> SubscriptionCreateResponse
-- client.subscriptions.update(subscription_identifier, \*, account_identifier, \*\*params) -> SubscriptionUpdateResponse
+- client.subscriptions.create(identifier, \*\*params) -> SubscriptionCreateResponse
+- client.subscriptions.update(subscription_identifier, \*, account_identifier, \*\*params) -> SubscriptionUpdateResponse
- client.subscriptions.list(account_identifier) -> SyncSinglePage[Subscription]
-- client.subscriptions.delete(subscription_identifier, \*, account_identifier, \*\*params) -> SubscriptionDeleteResponse
-- client.subscriptions.get(identifier) -> SubscriptionGetResponse
+- client.subscriptions.delete(subscription_identifier, \*, account_identifier, \*\*params) -> SubscriptionDeleteResponse
+- client.subscriptions.get(identifier) -> SubscriptionGetResponse
# ACM
@@ -1420,25 +1425,25 @@ Methods:
Types:
```python
-from cloudflare.types import AvailableRatePlan
+from cloudflare.types.plans import AvailableRatePlan
```
Methods:
-- client.plans.list(zone_identifier) -> SyncSinglePage[AvailableRatePlan]
-- client.plans.get(plan_identifier, \*, zone_identifier) -> AvailableRatePlan
+- client.plans.list(zone_identifier) -> SyncSinglePage[AvailableRatePlan]
+- client.plans.get(plan_identifier, \*, zone_identifier) -> AvailableRatePlan
# RatePlans
Types:
```python
-from cloudflare.types import RatePlan, RatePlanGetResponse
+from cloudflare.types.rate_plans import RatePlan, RatePlanGetResponse
```
Methods:
-- client.rate_plans.get(zone_identifier) -> Optional
+- client.rate_plans.get(zone_identifier) -> Optional
# CertificateAuthorities
@@ -1465,23 +1470,23 @@ Methods:
Types:
```python
-from cloudflare.types import ClientCertificate
+from cloudflare.types.client_certificates import ClientCertificate
```
Methods:
-- client.client_certificates.create(\*, zone_id, \*\*params) -> ClientCertificate
-- client.client_certificates.list(\*, zone_id, \*\*params) -> SyncV4PagePaginationArray[ClientCertificate]
-- client.client_certificates.delete(client_certificate_id, \*, zone_id) -> ClientCertificate
-- client.client_certificates.edit(client_certificate_id, \*, zone_id) -> ClientCertificate
-- client.client_certificates.get(client_certificate_id, \*, zone_id) -> ClientCertificate
+- client.client_certificates.create(\*, zone_id, \*\*params) -> ClientCertificate
+- client.client_certificates.list(\*, zone_id, \*\*params) -> SyncV4PagePaginationArray[ClientCertificate]
+- client.client_certificates.delete(client_certificate_id, \*, zone_id) -> ClientCertificate
+- client.client_certificates.edit(client_certificate_id, \*, zone_id) -> ClientCertificate
+- client.client_certificates.get(client_certificate_id, \*, zone_id) -> ClientCertificate
# CustomCertificates
Types:
```python
-from cloudflare.types import (
+from cloudflare.types.custom_certificates import (
CustomCertificate,
GeoRestrictions,
CustomCertificateCreateResponse,
@@ -1493,11 +1498,11 @@ from cloudflare.types import (
Methods:
-- client.custom_certificates.create(\*, zone_id, \*\*params) -> CustomCertificateCreateResponse
-- client.custom_certificates.list(\*, zone_id, \*\*params) -> SyncV4PagePaginationArray[CustomCertificate]
-- client.custom_certificates.delete(custom_certificate_id, \*, zone_id, \*\*params) -> CustomCertificateDeleteResponse
-- client.custom_certificates.edit(custom_certificate_id, \*, zone_id, \*\*params) -> CustomCertificateEditResponse
-- client.custom_certificates.get(custom_certificate_id, \*, zone_id) -> CustomCertificateGetResponse
+- client.custom_certificates.create(\*, zone_id, \*\*params) -> CustomCertificateCreateResponse
+- client.custom_certificates.list(\*, zone_id, \*\*params) -> SyncV4PagePaginationArray[CustomCertificate]
+- client.custom_certificates.delete(custom_certificate_id, \*, zone_id, \*\*params) -> CustomCertificateDeleteResponse
+- client.custom_certificates.edit(custom_certificate_id, \*, zone_id, \*\*params) -> CustomCertificateEditResponse
+- client.custom_certificates.get(custom_certificate_id, \*, zone_id) -> CustomCertificateGetResponse
## Prioritize
@@ -1516,7 +1521,7 @@ Methods:
Types:
```python
-from cloudflare.types import (
+from cloudflare.types.custom_hostnames import (
BundleMethod,
CustomHostname,
DCVMethod,
@@ -1531,11 +1536,11 @@ from cloudflare.types import (
Methods:
-- client.custom_hostnames.create(\*, zone_id, \*\*params) -> CustomHostnameCreateResponse
-- client.custom_hostnames.list(\*, zone_id, \*\*params) -> SyncV4PagePaginationArray[CustomHostnameListResponse]
-- client.custom_hostnames.delete(custom_hostname_id, \*, zone_id, \*\*params) -> CustomHostnameDeleteResponse
-- client.custom_hostnames.edit(custom_hostname_id, \*, zone_id, \*\*params) -> CustomHostnameEditResponse
-- client.custom_hostnames.get(custom_hostname_id, \*, zone_id) -> CustomHostnameGetResponse
+- client.custom_hostnames.create(\*, zone_id, \*\*params) -> CustomHostnameCreateResponse
+- client.custom_hostnames.list(\*, zone_id, \*\*params) -> SyncV4PagePaginationArray[CustomHostnameListResponse]
+- client.custom_hostnames.delete(custom_hostname_id, \*, zone_id, \*\*params) -> CustomHostnameDeleteResponse
+- client.custom_hostnames.edit(custom_hostname_id, \*, zone_id, \*\*params) -> CustomHostnameEditResponse
+- client.custom_hostnames.get(custom_hostname_id, \*, zone_id) -> CustomHostnameGetResponse
## FallbackOrigin
@@ -1560,7 +1565,7 @@ Methods:
Types:
```python
-from cloudflare.types import (
+from cloudflare.types.custom_nameservers import (
CustomNameserver,
CustomNameserverDeleteResponse,
CustomNameserverAvailabiltyResponse,
@@ -1571,18 +1576,18 @@ from cloudflare.types import (
Methods:
-- client.custom_nameservers.create(\*, account_id, \*\*params) -> CustomNameserver
-- client.custom_nameservers.delete(custom_ns_id, \*, account_id, \*\*params) -> Optional
-- client.custom_nameservers.availabilty(\*, account_id) -> Optional
-- client.custom_nameservers.get(\*, account_id) -> Optional
-- client.custom_nameservers.verify(\*, account_id, \*\*params) -> Optional
+- client.custom_nameservers.create(\*, account_id, \*\*params) -> CustomNameserver
+- client.custom_nameservers.delete(custom_ns_id, \*, account_id, \*\*params) -> Optional
+- client.custom_nameservers.availabilty(\*, account_id) -> Optional
+- client.custom_nameservers.get(\*, account_id) -> Optional
+- client.custom_nameservers.verify(\*, account_id, \*\*params) -> Optional
# DNS
Types:
```python
-from cloudflare.types import DNSAnalyticsNominalMetric, DNSAnalyticsQuery
+from cloudflare.types.dns import DNSAnalyticsNominalMetric, DNSAnalyticsQuery
```
## Records
@@ -1702,28 +1707,28 @@ Methods:
Types:
```python
-from cloudflare.types import DNSSEC, DNSSECDeleteResponse
+from cloudflare.types.dnssec import DNSSEC, DNSSECDeleteResponse
```
Methods:
-- client.dnssec.delete(\*, zone_id, \*\*params) -> DNSSECDeleteResponse
-- client.dnssec.edit(\*, zone_id, \*\*params) -> DNSSEC
-- client.dnssec.get(\*, zone_id) -> DNSSEC
+- client.dnssec.delete(\*, zone_id, \*\*params) -> DNSSECDeleteResponse
+- client.dnssec.edit(\*, zone_id, \*\*params) -> DNSSEC
+- client.dnssec.get(\*, zone_id) -> DNSSEC
# EmailRouting
Types:
```python
-from cloudflare.types import Settings
+from cloudflare.types.email_routing import Settings
```
Methods:
-- client.email_routing.disable(zone_identifier, \*\*params) -> Settings
-- client.email_routing.enable(zone_identifier, \*\*params) -> Settings
-- client.email_routing.get(zone_identifier) -> Settings
+- client.email_routing.disable(zone_identifier, \*\*params) -> Settings
+- client.email_routing.enable(zone_identifier, \*\*params) -> Settings
+- client.email_routing.get(zone_identifier) -> Settings
## DNS
@@ -1791,16 +1796,16 @@ Methods:
Types:
```python
-from cloudflare.types import FirewallFilter, FilterCreateResponse
+from cloudflare.types.filters import FirewallFilter, FilterCreateResponse
```
Methods:
-- client.filters.create(zone_identifier, \*\*params) -> Optional
-- client.filters.update(id, \*, zone_identifier, \*\*params) -> FirewallFilter
-- client.filters.list(zone_identifier, \*\*params) -> SyncV4PagePaginationArray[FirewallFilter]
-- client.filters.delete(id, \*, zone_identifier, \*\*params) -> FirewallFilter
-- client.filters.get(id, \*, zone_identifier) -> FirewallFilter
+- client.filters.create(zone_identifier, \*\*params) -> Optional
+- client.filters.update(id, \*, zone_identifier, \*\*params) -> FirewallFilter
+- client.filters.list(zone_identifier, \*\*params) -> SyncV4PagePaginationArray[FirewallFilter]
+- client.filters.delete(id, \*, zone_identifier, \*\*params) -> FirewallFilter
+- client.filters.get(id, \*, zone_identifier) -> FirewallFilter
# Firewall
@@ -1975,7 +1980,7 @@ Methods:
Types:
```python
-from cloudflare.types import (
+from cloudflare.types.healthchecks import (
CheckRegion,
Healthcheck,
HTTPConfiguration,
@@ -1987,12 +1992,12 @@ from cloudflare.types import (
Methods:
-- client.healthchecks.create(\*, zone_id, \*\*params) -> Healthcheck
-- client.healthchecks.update(healthcheck_id, \*, zone_id, \*\*params) -> Healthcheck
-- client.healthchecks.list(\*, zone_id) -> SyncSinglePage[Healthcheck]
-- client.healthchecks.delete(healthcheck_id, \*, zone_id, \*\*params) -> HealthcheckDeleteResponse
-- client.healthchecks.edit(healthcheck_id, \*, zone_id, \*\*params) -> Healthcheck
-- client.healthchecks.get(healthcheck_id, \*, zone_id) -> Healthcheck
+- client.healthchecks.create(\*, zone_id, \*\*params) -> Healthcheck
+- client.healthchecks.update(healthcheck_id, \*, zone_id, \*\*params) -> Healthcheck
+- client.healthchecks.list(\*, zone_id) -> SyncSinglePage[Healthcheck]
+- client.healthchecks.delete(healthcheck_id, \*, zone_id, \*\*params) -> HealthcheckDeleteResponse
+- client.healthchecks.edit(healthcheck_id, \*, zone_id, \*\*params) -> Healthcheck
+- client.healthchecks.get(healthcheck_id, \*, zone_id) -> Healthcheck
## Previews
@@ -2004,25 +2009,29 @@ from cloudflare.types.healthchecks import PreviewDeleteResponse
Methods:
-- client.healthchecks.previews.create(\*, zone_id, \*\*params) -> Healthcheck
+- client.healthchecks.previews.create(\*, zone_id, \*\*params) -> Healthcheck
- client.healthchecks.previews.delete(healthcheck_id, \*, zone_id, \*\*params) -> PreviewDeleteResponse
-- client.healthchecks.previews.get(healthcheck_id, \*, zone_id) -> Healthcheck
+- client.healthchecks.previews.get(healthcheck_id, \*, zone_id) -> Healthcheck
# KeylessCertificates
Types:
```python
-from cloudflare.types import KeylessCertificate, Tunnel, KeylessCertificateDeleteResponse
+from cloudflare.types.keyless_certificates import (
+ KeylessCertificate,
+ Tunnel,
+ KeylessCertificateDeleteResponse,
+)
```
Methods:
-- client.keyless_certificates.create(\*, zone_id, \*\*params) -> KeylessCertificate
-- client.keyless_certificates.list(\*, zone_id) -> SyncSinglePage[KeylessCertificate]
-- client.keyless_certificates.delete(keyless_certificate_id, \*, zone_id, \*\*params) -> KeylessCertificateDeleteResponse
-- client.keyless_certificates.edit(keyless_certificate_id, \*, zone_id, \*\*params) -> KeylessCertificate
-- client.keyless_certificates.get(keyless_certificate_id, \*, zone_id) -> KeylessCertificate
+- client.keyless_certificates.create(\*, zone_id, \*\*params) -> KeylessCertificate
+- client.keyless_certificates.list(\*, zone_id) -> SyncSinglePage[KeylessCertificate]
+- client.keyless_certificates.delete(keyless_certificate_id, \*, zone_id, \*\*params) -> KeylessCertificateDeleteResponse
+- client.keyless_certificates.edit(keyless_certificate_id, \*, zone_id, \*\*params) -> KeylessCertificate
+- client.keyless_certificates.get(keyless_certificate_id, \*, zone_id) -> KeylessCertificate
# Logpush
@@ -2183,7 +2192,7 @@ Methods:
Types:
```python
-from cloudflare.types import (
+from cloudflare.types.origin_tls_client_auth import (
ZoneAuthenticatedOriginPull,
OriginTLSClientAuthCreateResponse,
OriginTLSClientAuthDeleteResponse,
@@ -2193,10 +2202,10 @@ from cloudflare.types import (
Methods:
-- client.origin_tls_client_auth.create(\*, zone_id, \*\*params) -> OriginTLSClientAuthCreateResponse
-- client.origin_tls_client_auth.list(\*, zone_id) -> SyncSinglePage[ZoneAuthenticatedOriginPull]
-- client.origin_tls_client_auth.delete(certificate_id, \*, zone_id, \*\*params) -> OriginTLSClientAuthDeleteResponse
-- client.origin_tls_client_auth.get(certificate_id, \*, zone_id) -> OriginTLSClientAuthGetResponse
+- client.origin_tls_client_auth.create(\*, zone_id, \*\*params) -> OriginTLSClientAuthCreateResponse
+- client.origin_tls_client_auth.list(\*, zone_id) -> SyncSinglePage[ZoneAuthenticatedOriginPull]
+- client.origin_tls_client_auth.delete(certificate_id, \*, zone_id, \*\*params) -> OriginTLSClientAuthDeleteResponse
+- client.origin_tls_client_auth.get(certificate_id, \*, zone_id) -> OriginTLSClientAuthGetResponse
## Hostnames
@@ -2249,7 +2258,7 @@ Methods:
Types:
```python
-from cloudflare.types import (
+from cloudflare.types.pagerules import (
PageRule,
Route,
Target,
@@ -2265,12 +2274,12 @@ from cloudflare.types import (
Methods:
-- client.pagerules.create(\*, zone_id, \*\*params) -> PageruleCreateResponse
-- client.pagerules.update(pagerule_id, \*, zone_id, \*\*params) -> PageruleUpdateResponse
-- client.pagerules.list(\*, zone_id, \*\*params) -> PageruleListResponse
-- client.pagerules.delete(pagerule_id, \*, zone_id, \*\*params) -> Optional
-- client.pagerules.edit(pagerule_id, \*, zone_id, \*\*params) -> PageruleEditResponse
-- client.pagerules.get(pagerule_id, \*, zone_id) -> PageruleGetResponse
+- client.pagerules.create(\*, zone_id, \*\*params) -> PageruleCreateResponse
+- client.pagerules.update(pagerule_id, \*, zone_id, \*\*params) -> PageruleUpdateResponse
+- client.pagerules.list(\*, zone_id, \*\*params) -> PageruleListResponse
+- client.pagerules.delete(pagerule_id, \*, zone_id, \*\*params) -> Optional
+- client.pagerules.edit(pagerule_id, \*, zone_id, \*\*params) -> PageruleEditResponse
+- client.pagerules.get(pagerule_id, \*, zone_id) -> PageruleGetResponse
## Settings
@@ -2289,7 +2298,7 @@ Methods:
Types:
```python
-from cloudflare.types import (
+from cloudflare.types.rate_limits import (
Action,
Methods,
RateLimit,
@@ -2302,11 +2311,11 @@ from cloudflare.types import (
Methods:
-- client.rate_limits.create(zone_identifier, \*\*params) -> RateLimitCreateResponse
-- client.rate_limits.list(zone_identifier, \*\*params) -> SyncV4PagePaginationArray[RateLimit]
-- client.rate_limits.delete(id, \*, zone_identifier, \*\*params) -> RateLimitDeleteResponse
-- client.rate_limits.edit(id, \*, zone_identifier, \*\*params) -> RateLimitEditResponse
-- client.rate_limits.get(id, \*, zone_identifier) -> RateLimitGetResponse
+- client.rate_limits.create(zone_identifier, \*\*params) -> RateLimitCreateResponse
+- client.rate_limits.list(zone_identifier, \*\*params) -> SyncV4PagePaginationArray[RateLimit]
+- client.rate_limits.delete(id, \*, zone_identifier, \*\*params) -> RateLimitDeleteResponse
+- client.rate_limits.edit(id, \*, zone_identifier, \*\*params) -> RateLimitEditResponse
+- client.rate_limits.get(id, \*, zone_identifier) -> RateLimitGetResponse
# SecondaryDNS
@@ -2430,7 +2439,7 @@ Methods:
Types:
```python
-from cloudflare.types import (
+from cloudflare.types.waiting_rooms import (
AdditionalRoutes,
CookieAttributes,
Query,
@@ -2441,12 +2450,12 @@ from cloudflare.types import (
Methods:
-- client.waiting_rooms.create(\*, zone_id, \*\*params) -> WaitingRoom
-- client.waiting_rooms.update(waiting_room_id, \*, zone_id, \*\*params) -> WaitingRoom
-- client.waiting_rooms.list(\*, zone_id, \*\*params) -> SyncSinglePage[WaitingRoom]
-- client.waiting_rooms.delete(waiting_room_id, \*, zone_id, \*\*params) -> WaitingRoomDeleteResponse
-- client.waiting_rooms.edit(waiting_room_id, \*, zone_id, \*\*params) -> WaitingRoom
-- client.waiting_rooms.get(waiting_room_id, \*, zone_id) -> WaitingRoom
+- client.waiting_rooms.create(\*, zone_id, \*\*params) -> WaitingRoom
+- client.waiting_rooms.update(waiting_room_id, \*, zone_id, \*\*params) -> WaitingRoom
+- client.waiting_rooms.list(\*, zone_id, \*\*params) -> SyncSinglePage[WaitingRoom]
+- client.waiting_rooms.delete(waiting_room_id, \*, zone_id, \*\*params) -> WaitingRoomDeleteResponse
+- client.waiting_rooms.edit(waiting_room_id, \*, zone_id, \*\*params) -> WaitingRoom
+- client.waiting_rooms.get(waiting_room_id, \*, zone_id) -> WaitingRoom
## Page
@@ -2602,7 +2611,7 @@ Methods:
Types:
```python
-from cloudflare.types import (
+from cloudflare.types.workers import (
Binding,
D1Binding,
DispatchNamespaceBinding,
@@ -2871,16 +2880,16 @@ Methods:
Types:
```python
-from cloudflare.types import Queue, QueueCreated, QueueUpdated, QueueDeleteResponse
+from cloudflare.types.queues import Queue, QueueCreated, QueueUpdated, QueueDeleteResponse
```
Methods:
-- client.queues.create(\*, account_id, \*\*params) -> Optional
-- client.queues.update(queue_id, \*, account_id, \*\*params) -> Optional
-- client.queues.list(\*, account_id) -> SyncSinglePage[Queue]
-- client.queues.delete(queue_id, \*, account_id, \*\*params) -> Optional
-- client.queues.get(queue_id, \*, account_id) -> Optional
+- client.queues.create(\*, account_id, \*\*params) -> Optional
+- client.queues.update(queue_id, \*, account_id, \*\*params) -> Optional
+- client.queues.list(\*, account_id) -> SyncSinglePage[Queue]
+- client.queues.delete(queue_id, \*, account_id, \*\*params) -> Optional
+- client.queues.get(queue_id, \*, account_id) -> Optional
## Consumers
@@ -2921,26 +2930,30 @@ Methods:
Types:
```python
-from cloudflare.types import RequestModel, ManagedHeaderListResponse, ManagedHeaderEditResponse
+from cloudflare.types.managed_headers import (
+ RequestModel,
+ ManagedHeaderListResponse,
+ ManagedHeaderEditResponse,
+)
```
Methods:
-- client.managed_headers.list(\*, zone_id) -> ManagedHeaderListResponse
-- client.managed_headers.edit(\*, zone_id, \*\*params) -> ManagedHeaderEditResponse
+- client.managed_headers.list(\*, zone_id) -> ManagedHeaderListResponse
+- client.managed_headers.edit(\*, zone_id, \*\*params) -> ManagedHeaderEditResponse
# PageShield
Types:
```python
-from cloudflare.types import Setting, PageShieldUpdateResponse
+from cloudflare.types.page_shield import Setting, PageShieldUpdateResponse
```
Methods:
-- client.page_shield.update(\*, zone_id, \*\*params) -> PageShieldUpdateResponse
-- client.page_shield.get(\*, zone_id) -> Setting
+- client.page_shield.update(\*, zone_id, \*\*params) -> PageShieldUpdateResponse
+- client.page_shield.get(\*, zone_id) -> Setting
## Policies
@@ -2989,7 +3002,7 @@ Methods:
Types:
```python
-from cloudflare.types import (
+from cloudflare.types.rulesets import (
Ruleset,
RulesetCreateResponse,
RulesetUpdateResponse,
@@ -2999,11 +3012,11 @@ from cloudflare.types import (
Methods:
-- client.rulesets.create(\*, account_id, zone_id, \*\*params) -> RulesetCreateResponse
-- client.rulesets.update(ruleset_id, \*, account_id, zone_id, \*\*params) -> RulesetUpdateResponse
-- client.rulesets.list(\*, account_id, zone_id) -> SyncSinglePage[Ruleset]
+- client.rulesets.create(\*, account_id, zone_id, \*\*params) -> RulesetCreateResponse
+- client.rulesets.update(ruleset_id, \*, account_id, zone_id, \*\*params) -> RulesetUpdateResponse
+- client.rulesets.list(\*, account_id, zone_id) -> SyncSinglePage[Ruleset]
- client.rulesets.delete(ruleset_id, \*, account_id, zone_id) -> None
-- client.rulesets.get(ruleset_id, \*, account_id, zone_id) -> RulesetGetResponse
+- client.rulesets.get(ruleset_id, \*, account_id, zone_id) -> RulesetGetResponse
## Phases
@@ -3028,7 +3041,7 @@ from cloudflare.types.rulesets.phases import VersionGetResponse
Methods:
-- client.rulesets.phases.versions.list(ruleset_phase, \*, account_id, zone_id) -> SyncSinglePage[Ruleset]
+- client.rulesets.phases.versions.list(ruleset_phase, \*, account_id, zone_id) -> SyncSinglePage[Ruleset]
- client.rulesets.phases.versions.get(ruleset_version, \*, ruleset_phase, account_id, zone_id) -> VersionGetResponse
## Rules
@@ -3077,7 +3090,7 @@ from cloudflare.types.rulesets import VersionGetResponse
Methods:
-- client.rulesets.versions.list(ruleset_id, \*, account_id, zone_id) -> SyncSinglePage[Ruleset]
+- client.rulesets.versions.list(ruleset_id, \*, account_id, zone_id) -> SyncSinglePage[Ruleset]
- client.rulesets.versions.delete(ruleset_version, \*, ruleset_id, account_id, zone_id) -> None
- client.rulesets.versions.get(ruleset_version, \*, ruleset_id, account_id, zone_id) -> VersionGetResponse
@@ -3098,20 +3111,23 @@ Methods:
Types:
```python
-from cloudflare.types import URLNormalizationUpdateResponse, URLNormalizationGetResponse
+from cloudflare.types.url_normalization import (
+ URLNormalizationUpdateResponse,
+ URLNormalizationGetResponse,
+)
```
Methods:
-- client.url_normalization.update(\*, zone_id, \*\*params) -> URLNormalizationUpdateResponse
-- client.url_normalization.get(\*, zone_id) -> URLNormalizationGetResponse
+- client.url_normalization.update(\*, zone_id, \*\*params) -> URLNormalizationUpdateResponse
+- client.url_normalization.get(\*, zone_id) -> URLNormalizationGetResponse
# Spectrum
Types:
```python
-from cloudflare.types import DNS, EdgeIPs, OriginDNS, OriginPort
+from cloudflare.types.spectrum import DNS, EdgeIPs, OriginDNS, OriginPort
```
## Analytics
@@ -3360,7 +3376,7 @@ Methods:
Methods:
-- client.audit_logs.list(\*, account_id, \*\*params) -> SyncV4PagePaginationArray[AuditLog]
+- client.audit_logs.list(\*, account_id, \*\*params) -> SyncV4PagePaginationArray[AuditLog]
# Billing
@@ -3381,13 +3397,19 @@ Methods:
Types:
```python
-from cloudflare.types import Info, RuleMatch, ScanStatus, Submit, URLInfoModelResults
+from cloudflare.types.brand_protection import (
+ Info,
+ RuleMatch,
+ ScanStatus,
+ Submit,
+ URLInfoModelResults,
+)
```
Methods:
-- client.brand_protection.submit(\*, account_id, \*\*params) -> Submit
-- client.brand_protection.url_info(\*, account_id, \*\*params) -> Info
+- client.brand_protection.submit(\*, account_id, \*\*params) -> Submit
+- client.brand_protection.url_info(\*, account_id, \*\*params) -> Info
# Diagnostics
@@ -3719,7 +3741,7 @@ Methods:
Types:
```python
-from cloudflare.types import HealthCheck, HealthCheckRate, HealthCheckType
+from cloudflare.types.magic_transit import HealthCheck, HealthCheckRate, HealthCheckType
```
## CfInterconnects
@@ -3974,15 +3996,15 @@ Methods:
Types:
```python
-from cloudflare.types import MTLSCertificate, MTLSCertificateCreateResponse
+from cloudflare.types.mtls_certificates import MTLSCertificate, MTLSCertificateCreateResponse
```
Methods:
-- client.mtls_certificates.create(\*, account_id, \*\*params) -> MTLSCertificateCreateResponse
-- client.mtls_certificates.list(\*, account_id) -> SyncSinglePage[MTLSCertificate]
-- client.mtls_certificates.delete(mtls_certificate_id, \*, account_id, \*\*params) -> MTLSCertificate
-- client.mtls_certificates.get(mtls_certificate_id, \*, account_id) -> MTLSCertificate
+- client.mtls_certificates.create(\*, account_id, \*\*params) -> MTLSCertificateCreateResponse
+- client.mtls_certificates.list(\*, account_id) -> SyncSinglePage[MTLSCertificate]
+- client.mtls_certificates.delete(mtls_certificate_id, \*, account_id, \*\*params) -> MTLSCertificate
+- client.mtls_certificates.get(mtls_certificate_id, \*, account_id) -> MTLSCertificate
## Associations
@@ -4081,14 +4103,20 @@ Methods:
Types:
```python
-from cloudflare.types import PCAP, PCAPFilter, PCAPCreateResponse, PCAPListResponse, PCAPGetResponse
+from cloudflare.types.pcaps import (
+ PCAP,
+ PCAPFilter,
+ PCAPCreateResponse,
+ PCAPListResponse,
+ PCAPGetResponse,
+)
```
Methods:
-- client.pcaps.create(\*, account_id, \*\*params) -> PCAPCreateResponse
-- client.pcaps.list(\*, account_id) -> SyncSinglePage[PCAPListResponse]
-- client.pcaps.get(pcap_id, \*, account_id) -> PCAPGetResponse
+- client.pcaps.create(\*, account_id, \*\*params) -> PCAPCreateResponse
+- client.pcaps.list(\*, account_id) -> SyncSinglePage[PCAPListResponse]
+- client.pcaps.get(pcap_id, \*, account_id) -> PCAPGetResponse
## OwnershipResource
@@ -4215,15 +4243,15 @@ Methods:
Types:
```python
-from cloudflare.types import AllowedOrigins, Video
+from cloudflare.types.stream import AllowedOrigins, Video
```
Methods:
-- client.stream.create(\*, account_id, \*\*params) -> None
-- client.stream.list(\*, account_id, \*\*params) -> SyncSinglePage[Video]
-- client.stream.delete(identifier, \*, account_id, \*\*params) -> None
-- client.stream.get(identifier, \*, account_id) -> Optional
+- client.stream.create(\*, account_id, \*\*params) -> None
+- client.stream.list(\*, account_id, \*\*params) -> SyncSinglePage[Video]
+- client.stream.delete(identifier, \*, account_id, \*\*params) -> None
+- client.stream.get(identifier, \*, account_id) -> Optional
## AudioTracks
@@ -4268,7 +4296,7 @@ Methods:
Methods:
-- client.stream.copy.create(\*, account_id, \*\*params) -> Optional
+- client.stream.copy.create(\*, account_id, \*\*params) -> Optional
## DirectUpload
@@ -4427,7 +4455,7 @@ Methods:
Types:
```python
-from cloudflare.types import Alert
+from cloudflare.types.alerting import Alert
```
## AvailableAlerts
@@ -4538,7 +4566,7 @@ Methods:
Types:
```python
-from cloudflare.types import D1
+from cloudflare.types.d1 import D1
```
## Database
@@ -4560,7 +4588,7 @@ Methods:
- client.d1.database.create(\*, account_id, \*\*params) -> DatabaseCreateResponse
- client.d1.database.list(\*, account_id, \*\*params) -> SyncV4PagePaginationArray[DatabaseListResponse]
- client.d1.database.delete(database_identifier, \*, account_identifier) -> DatabaseDeleteResponse
-- client.d1.database.get(database_identifier, \*, account_identifier) -> D1
+- client.d1.database.get(database_identifier, \*, account_identifier) -> D1
- client.d1.database.query(database_identifier, \*, account_identifier, \*\*params) -> DatabaseQueryResponse
# R2
@@ -4599,7 +4627,7 @@ Methods:
Types:
```python
-from cloudflare.types import (
+from cloudflare.types.warp_connector import (
WARPConnectorCreateResponse,
WARPConnectorListResponse,
WARPConnectorDeleteResponse,
@@ -4611,12 +4639,12 @@ from cloudflare.types import (
Methods:
-- client.warp_connector.create(\*, account_id, \*\*params) -> WARPConnectorCreateResponse
-- client.warp_connector.list(\*, account_id, \*\*params) -> SyncV4PagePaginationArray[WARPConnectorListResponse]
-- client.warp_connector.delete(tunnel_id, \*, account_id, \*\*params) -> WARPConnectorDeleteResponse
-- client.warp_connector.edit(tunnel_id, \*, account_id, \*\*params) -> WARPConnectorEditResponse
-- client.warp_connector.get(tunnel_id, \*, account_id) -> WARPConnectorGetResponse
-- client.warp_connector.token(tunnel_id, \*, account_id) -> WARPConnectorTokenResponse
+- client.warp_connector.create(\*, account_id, \*\*params) -> WARPConnectorCreateResponse
+- client.warp_connector.list(\*, account_id, \*\*params) -> SyncV4PagePaginationArray[WARPConnectorListResponse]
+- client.warp_connector.delete(tunnel_id, \*, account_id, \*\*params) -> WARPConnectorDeleteResponse
+- client.warp_connector.edit(tunnel_id, \*, account_id, \*\*params) -> WARPConnectorEditResponse
+- client.warp_connector.get(tunnel_id, \*, account_id) -> WARPConnectorGetResponse
+- client.warp_connector.token(tunnel_id, \*, account_id) -> WARPConnectorTokenResponse
# WorkersForPlatforms
@@ -5921,7 +5949,7 @@ Methods:
Types:
```python
-from cloudflare.types import Configuration, Hyperdrive
+from cloudflare.types.hyperdrive import Configuration, Hyperdrive
```
## Configs
@@ -5934,12 +5962,12 @@ from cloudflare.types.hyperdrive import ConfigDeleteResponse
Methods:
-- client.hyperdrive.configs.create(\*, account_id, \*\*params) -> Optional
-- client.hyperdrive.configs.update(hyperdrive_id, \*, account_id, \*\*params) -> Optional
-- client.hyperdrive.configs.list(\*, account_id) -> SyncSinglePage[Hyperdrive]
+- client.hyperdrive.configs.create(\*, account_id, \*\*params) -> Optional
+- client.hyperdrive.configs.update(hyperdrive_id, \*, account_id, \*\*params) -> Optional
+- client.hyperdrive.configs.list(\*, account_id) -> SyncSinglePage[Hyperdrive]
- client.hyperdrive.configs.delete(hyperdrive_id, \*, account_id) -> ConfigDeleteResponse
-- client.hyperdrive.configs.edit(hyperdrive_id, \*, account_id, \*\*params) -> Optional
-- client.hyperdrive.configs.get(hyperdrive_id, \*, account_id) -> Optional
+- client.hyperdrive.configs.edit(hyperdrive_id, \*, account_id, \*\*params) -> Optional
+- client.hyperdrive.configs.get(hyperdrive_id, \*, account_id) -> Optional
# RUM
@@ -5996,12 +6024,12 @@ from cloudflare.types.vectorize import (
Types:
```python
-from cloudflare.types import URLScannerScanResponse
+from cloudflare.types.url_scanner import URLScannerScanResponse
```
Methods:
-- client.url_scanner.scan(account_id, \*\*params) -> URLScannerScanResponse
+- client.url_scanner.scan(account_id, \*\*params) -> URLScannerScanResponse
## Scans
@@ -7080,7 +7108,7 @@ Methods:
Types:
```python
-from cloudflare.types import (
+from cloudflare.types.bot_management import (
BotFightModeConfiguration,
SubscriptionConfiguration,
SuperBotFightModeDefinitelyConfiguration,
@@ -7092,15 +7120,15 @@ from cloudflare.types import (
Methods:
-- client.bot_management.update(\*, zone_id, \*\*params) -> BotManagementUpdateResponse
-- client.bot_management.get(\*, zone_id) -> BotManagementGetResponse
+- client.bot_management.update(\*, zone_id, \*\*params) -> BotManagementUpdateResponse
+- client.bot_management.get(\*, zone_id) -> BotManagementGetResponse
# OriginPostQuantumEncryption
Types:
```python
-from cloudflare.types import (
+from cloudflare.types.origin_post_quantum_encryption import (
OriginPostQuantumEncryptionUpdateResponse,
OriginPostQuantumEncryptionGetResponse,
)
@@ -7108,22 +7136,22 @@ from cloudflare.types import (
Methods:
-- client.origin_post_quantum_encryption.update(\*, zone_id, \*\*params) -> OriginPostQuantumEncryptionUpdateResponse
-- client.origin_post_quantum_encryption.get(\*, zone_id) -> OriginPostQuantumEncryptionGetResponse
+- client.origin_post_quantum_encryption.update(\*, zone_id, \*\*params) -> OriginPostQuantumEncryptionUpdateResponse
+- client.origin_post_quantum_encryption.get(\*, zone_id) -> OriginPostQuantumEncryptionGetResponse
# Speed
Types:
```python
-from cloudflare.types import LabeledRegion, LighthouseReport, Trend, SpeedDeleteResponse
+from cloudflare.types.speed import LabeledRegion, LighthouseReport, Trend, SpeedDeleteResponse
```
Methods:
-- client.speed.delete(url, \*, zone_id, \*\*params) -> Optional
-- client.speed.schedule_get(url, \*, zone_id, \*\*params) -> Optional
-- client.speed.trends_list(url, \*, zone_id, \*\*params) -> Optional
+- client.speed.delete(url, \*, zone_id, \*\*params) -> Optional
+- client.speed.schedule_get(url, \*, zone_id, \*\*params) -> Optional
+- client.speed.trends_list(url, \*, zone_id, \*\*params) -> Optional
## Tests
@@ -7218,15 +7246,15 @@ Methods:
Types:
```python
-from cloudflare.types import Snippet, SnippetDeleteResponse
+from cloudflare.types.snippets import Snippet, SnippetDeleteResponse
```
Methods:
-- client.snippets.update(snippet_name, \*, zone_identifier, \*\*params) -> Snippet
-- client.snippets.list(zone_identifier) -> SyncSinglePage[Snippet]
-- client.snippets.delete(snippet_name, \*, zone_identifier) -> SnippetDeleteResponse
-- client.snippets.get(snippet_name, \*, zone_identifier) -> Snippet
+- client.snippets.update(snippet_name, \*, zone_identifier, \*\*params) -> Snippet
+- client.snippets.list(zone_identifier) -> SyncSinglePage[Snippet]
+- client.snippets.delete(snippet_name, \*, zone_identifier) -> SnippetDeleteResponse
+- client.snippets.get(snippet_name, \*, zone_identifier) -> Snippet
## Content
@@ -7252,16 +7280,16 @@ Methods:
Types:
```python
-from cloudflare.types import CallsApp, CallsAppWithSecret
+from cloudflare.types.calls import CallsApp, CallsAppWithSecret
```
Methods:
-- client.calls.create(\*, account_id, \*\*params) -> Optional
-- client.calls.update(app_id, \*, account_id, \*\*params) -> Optional
-- client.calls.list(\*, account_id) -> SyncSinglePage[CallsApp]
-- client.calls.delete(app_id, \*, account_id) -> Optional
-- client.calls.get(app_id, \*, account_id) -> Optional
+- client.calls.create(\*, account_id, \*\*params) -> Optional
+- client.calls.update(app_id, \*, account_id, \*\*params) -> Optional
+- client.calls.list(\*, account_id) -> SyncSinglePage[CallsApp]
+- client.calls.delete(app_id, \*, account_id) -> Optional
+- client.calls.get(app_id, \*, account_id) -> Optional
# CloudforceOne
diff --git a/src/cloudflare/resources/accounts/accounts.py b/src/cloudflare/resources/accounts/accounts.py
index e28952068c5..b51559776f4 100644
--- a/src/cloudflare/resources/accounts/accounts.py
+++ b/src/cloudflare/resources/accounts/accounts.py
@@ -15,12 +15,6 @@
RolesWithStreamingResponse,
AsyncRolesWithStreamingResponse,
)
-from ...types import (
- AccountGetResponse,
- AccountUpdateResponse,
- account_list_params,
- account_update_params,
-)
from .members import (
Members,
AsyncMembers,
@@ -48,6 +42,7 @@
AsyncPaginator,
make_request_options,
)
+from ...types.accounts import AccountGetResponse, AccountUpdateResponse, account_list_params, account_update_params
__all__ = ["Accounts", "AsyncAccounts"]
diff --git a/src/cloudflare/resources/audit_logs.py b/src/cloudflare/resources/audit_logs.py
index a3e27c5c9fe..5cfd91749b5 100644
--- a/src/cloudflare/resources/audit_logs.py
+++ b/src/cloudflare/resources/audit_logs.py
@@ -8,7 +8,6 @@
import httpx
-from ..types import audit_log_list_params
from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from .._utils import maybe_transform
from .._compat import cached_property
@@ -25,6 +24,7 @@
make_request_options,
)
from ..types.shared import AuditLog
+from ..types.audit_logs import audit_log_list_params
__all__ = ["AuditLogs", "AsyncAuditLogs"]
diff --git a/src/cloudflare/resources/bot_management.py b/src/cloudflare/resources/bot_management.py
index 4956e7c85c4..13fa6a8c4fc 100644
--- a/src/cloudflare/resources/bot_management.py
+++ b/src/cloudflare/resources/bot_management.py
@@ -7,7 +7,6 @@
import httpx
-from ..types import BotManagementGetResponse, BotManagementUpdateResponse, bot_management_update_params
from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from .._utils import (
required_args,
@@ -26,6 +25,7 @@
from .._base_client import (
make_request_options,
)
+from ..types.bot_management import BotManagementGetResponse, BotManagementUpdateResponse, bot_management_update_params
__all__ = ["BotManagement", "AsyncBotManagement"]
diff --git a/src/cloudflare/resources/brand_protection.py b/src/cloudflare/resources/brand_protection.py
index 12f0f1a12f3..0e8ca30c031 100644
--- a/src/cloudflare/resources/brand_protection.py
+++ b/src/cloudflare/resources/brand_protection.py
@@ -6,7 +6,6 @@
import httpx
-from ..types import Info, Submit, brand_protection_submit_params, brand_protection_url_info_params
from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from .._utils import (
maybe_transform,
@@ -24,6 +23,7 @@
from .._base_client import (
make_request_options,
)
+from ..types.brand_protection import Info, Submit, brand_protection_submit_params, brand_protection_url_info_params
__all__ = ["BrandProtection", "AsyncBrandProtection"]
diff --git a/src/cloudflare/resources/cache/cache.py b/src/cloudflare/resources/cache/cache.py
index 2c82f409763..fe156367f28 100644
--- a/src/cloudflare/resources/cache/cache.py
+++ b/src/cloudflare/resources/cache/cache.py
@@ -6,7 +6,6 @@
import httpx
-from ...types import CachePurgeResponse, cache_purge_params
from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ..._utils import (
required_args,
@@ -30,6 +29,7 @@
async_to_streamed_response_wrapper,
)
from ..._wrappers import ResultWrapper
+from ...types.cache import CachePurgeResponse, cache_purge_params
from .cache_reserve import (
CacheReserveResource,
AsyncCacheReserveResource,
diff --git a/src/cloudflare/resources/calls.py b/src/cloudflare/resources/calls.py
index 383090a8c33..9cd98637a7f 100644
--- a/src/cloudflare/resources/calls.py
+++ b/src/cloudflare/resources/calls.py
@@ -6,7 +6,6 @@
import httpx
-from ..types import CallsApp, CallsAppWithSecret, call_create_params, call_update_params
from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from .._utils import (
maybe_transform,
@@ -22,6 +21,7 @@
)
from .._wrappers import ResultWrapper
from ..pagination import SyncSinglePage, AsyncSinglePage
+from ..types.calls import CallsApp, CallsAppWithSecret, call_create_params, call_update_params
from .._base_client import (
AsyncPaginator,
make_request_options,
diff --git a/src/cloudflare/resources/client_certificates.py b/src/cloudflare/resources/client_certificates.py
index bf6f2cbdef4..aeba582dbec 100644
--- a/src/cloudflare/resources/client_certificates.py
+++ b/src/cloudflare/resources/client_certificates.py
@@ -7,7 +7,6 @@
import httpx
-from ..types import ClientCertificate, client_certificate_list_params, client_certificate_create_params
from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from .._utils import (
maybe_transform,
@@ -27,6 +26,11 @@
AsyncPaginator,
make_request_options,
)
+from ..types.client_certificates import (
+ ClientCertificate,
+ client_certificate_list_params,
+ client_certificate_create_params,
+)
__all__ = ["ClientCertificates", "AsyncClientCertificates"]
diff --git a/src/cloudflare/resources/custom_certificates/custom_certificates.py b/src/cloudflare/resources/custom_certificates/custom_certificates.py
index e2d0565b5ad..6ef4cb60b34 100644
--- a/src/cloudflare/resources/custom_certificates/custom_certificates.py
+++ b/src/cloudflare/resources/custom_certificates/custom_certificates.py
@@ -7,19 +7,6 @@
import httpx
-from ...types import (
- BundleMethod,
- CustomCertificate,
- GeoRestrictionsParam,
- CustomCertificateGetResponse,
- CustomCertificateEditResponse,
- CustomCertificateCreateResponse,
- CustomCertificateDeleteResponse,
- custom_certificate_edit_params,
- custom_certificate_list_params,
- custom_certificate_create_params,
- custom_certificate_delete_params,
-)
from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ..._utils import (
maybe_transform,
@@ -47,6 +34,19 @@
AsyncPaginator,
make_request_options,
)
+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,
+)
__all__ = ["CustomCertificates", "AsyncCustomCertificates"]
diff --git a/src/cloudflare/resources/custom_hostnames/custom_hostnames.py b/src/cloudflare/resources/custom_hostnames/custom_hostnames.py
index 843db8f0908..a25f2cdbf7c 100644
--- a/src/cloudflare/resources/custom_hostnames/custom_hostnames.py
+++ b/src/cloudflare/resources/custom_hostnames/custom_hostnames.py
@@ -7,17 +7,6 @@
import httpx
-from ...types import (
- CustomHostnameGetResponse,
- CustomHostnameEditResponse,
- CustomHostnameListResponse,
- CustomHostnameCreateResponse,
- CustomHostnameDeleteResponse,
- custom_hostname_edit_params,
- custom_hostname_list_params,
- custom_hostname_create_params,
- custom_hostname_delete_params,
-)
from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ..._utils import (
maybe_transform,
@@ -45,6 +34,17 @@
FallbackOriginWithStreamingResponse,
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,
+)
__all__ = ["CustomHostnames", "AsyncCustomHostnames"]
diff --git a/src/cloudflare/resources/custom_nameservers.py b/src/cloudflare/resources/custom_nameservers.py
index 6223345685a..b2dbe0fb62c 100644
--- a/src/cloudflare/resources/custom_nameservers.py
+++ b/src/cloudflare/resources/custom_nameservers.py
@@ -6,16 +6,6 @@
import httpx
-from ..types import (
- CustomNameserver,
- CustomNameserverGetResponse,
- CustomNameserverDeleteResponse,
- CustomNameserverVerifyResponse,
- CustomNameserverAvailabiltyResponse,
- custom_nameserver_create_params,
- custom_nameserver_delete_params,
- custom_nameserver_verify_params,
-)
from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from .._utils import (
maybe_transform,
@@ -33,6 +23,16 @@
from .._base_client import (
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,
+)
__all__ = ["CustomNameservers", "AsyncCustomNameservers"]
diff --git a/src/cloudflare/resources/d1/database.py b/src/cloudflare/resources/d1/database.py
index 63765c014b2..442ee4fa9f0 100644
--- a/src/cloudflare/resources/d1/database.py
+++ b/src/cloudflare/resources/d1/database.py
@@ -6,7 +6,6 @@
import httpx
-from ...types import D1
from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ..._utils import (
maybe_transform,
@@ -14,6 +13,7 @@
)
from ..._compat import cached_property
from ...types.d1 import (
+ D1,
DatabaseListResponse,
DatabaseQueryResponse,
DatabaseCreateResponse,
diff --git a/src/cloudflare/resources/dnssec.py b/src/cloudflare/resources/dnssec.py
index 5cb64138375..3ab1c9c9b95 100644
--- a/src/cloudflare/resources/dnssec.py
+++ b/src/cloudflare/resources/dnssec.py
@@ -7,7 +7,6 @@
import httpx
-from ..types import DNSSEC, DNSSECDeleteResponse, dnssec_edit_params, dnssec_delete_params
from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from .._utils import (
maybe_transform,
@@ -25,6 +24,7 @@
from .._base_client import (
make_request_options,
)
+from ..types.dnssec import DNSSEC, DNSSECDeleteResponse, dnssec_edit_params, dnssec_delete_params
__all__ = ["DNSSECResource", "AsyncDNSSECResource"]
diff --git a/src/cloudflare/resources/email_routing/email_routing.py b/src/cloudflare/resources/email_routing/email_routing.py
index 5636c839f42..687d6459031 100644
--- a/src/cloudflare/resources/email_routing/email_routing.py
+++ b/src/cloudflare/resources/email_routing/email_routing.py
@@ -22,7 +22,6 @@
RulesWithStreamingResponse,
AsyncRulesWithStreamingResponse,
)
-from ...types import Settings, email_routing_enable_params, email_routing_disable_params
from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ..._utils import (
maybe_transform,
@@ -49,6 +48,7 @@
from ..._base_client import (
make_request_options,
)
+from ...types.email_routing import Settings, email_routing_enable_params, email_routing_disable_params
__all__ = ["EmailRouting", "AsyncEmailRouting"]
diff --git a/src/cloudflare/resources/filters.py b/src/cloudflare/resources/filters.py
index 4e6d7d706ce..437ffc33ac9 100644
--- a/src/cloudflare/resources/filters.py
+++ b/src/cloudflare/resources/filters.py
@@ -6,14 +6,6 @@
import httpx
-from ..types import (
- FirewallFilter,
- FilterCreateResponse,
- filter_list_params,
- filter_create_params,
- filter_delete_params,
- filter_update_params,
-)
from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from .._utils import (
maybe_transform,
@@ -33,6 +25,14 @@
AsyncPaginator,
make_request_options,
)
+from ..types.filters import (
+ FirewallFilter,
+ FilterCreateResponse,
+ filter_list_params,
+ filter_create_params,
+ filter_delete_params,
+ filter_update_params,
+)
__all__ = ["Filters", "AsyncFilters"]
diff --git a/src/cloudflare/resources/healthchecks/healthchecks.py b/src/cloudflare/resources/healthchecks/healthchecks.py
index 060a1b661d9..e563f71073d 100644
--- a/src/cloudflare/resources/healthchecks/healthchecks.py
+++ b/src/cloudflare/resources/healthchecks/healthchecks.py
@@ -6,17 +6,6 @@
import httpx
-from ...types import (
- CheckRegion,
- Healthcheck,
- TCPConfigurationParam,
- HTTPConfigurationParam,
- HealthcheckDeleteResponse,
- healthcheck_edit_params,
- healthcheck_create_params,
- healthcheck_delete_params,
- healthcheck_update_params,
-)
from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ..._utils import (
maybe_transform,
@@ -44,6 +33,17 @@
AsyncPaginator,
make_request_options,
)
+from ...types.healthchecks import (
+ CheckRegion,
+ Healthcheck,
+ TCPConfigurationParam,
+ HTTPConfigurationParam,
+ HealthcheckDeleteResponse,
+ healthcheck_edit_params,
+ healthcheck_create_params,
+ healthcheck_delete_params,
+ healthcheck_update_params,
+)
__all__ = ["Healthchecks", "AsyncHealthchecks"]
diff --git a/src/cloudflare/resources/healthchecks/previews.py b/src/cloudflare/resources/healthchecks/previews.py
index 244cf878ccf..09228bdc38d 100644
--- a/src/cloudflare/resources/healthchecks/previews.py
+++ b/src/cloudflare/resources/healthchecks/previews.py
@@ -6,12 +6,6 @@
import httpx
-from ...types import (
- CheckRegion,
- Healthcheck,
- TCPConfigurationParam,
- HTTPConfigurationParam,
-)
from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ..._utils import (
maybe_transform,
@@ -29,7 +23,15 @@
from ..._base_client import (
make_request_options,
)
-from ...types.healthchecks import PreviewDeleteResponse, preview_create_params, preview_delete_params
+from ...types.healthchecks import (
+ CheckRegion,
+ Healthcheck,
+ PreviewDeleteResponse,
+ TCPConfigurationParam,
+ HTTPConfigurationParam,
+ preview_create_params,
+ preview_delete_params,
+)
__all__ = ["Previews", "AsyncPreviews"]
diff --git a/src/cloudflare/resources/hyperdrive/configs.py b/src/cloudflare/resources/hyperdrive/configs.py
index cb31f7565ae..7d961c519f0 100644
--- a/src/cloudflare/resources/hyperdrive/configs.py
+++ b/src/cloudflare/resources/hyperdrive/configs.py
@@ -6,7 +6,6 @@
import httpx
-from ...types import Hyperdrive, ConfigurationParam
from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ..._utils import (
maybe_transform,
@@ -26,7 +25,14 @@
AsyncPaginator,
make_request_options,
)
-from ...types.hyperdrive import ConfigDeleteResponse, config_edit_params, config_create_params, config_update_params
+from ...types.hyperdrive import (
+ Hyperdrive,
+ ConfigurationParam,
+ ConfigDeleteResponse,
+ config_edit_params,
+ config_create_params,
+ config_update_params,
+)
__all__ = ["Configs", "AsyncConfigs"]
diff --git a/src/cloudflare/resources/ips.py b/src/cloudflare/resources/ips.py
index 136d48aaf80..2214c78b030 100644
--- a/src/cloudflare/resources/ips.py
+++ b/src/cloudflare/resources/ips.py
@@ -6,7 +6,6 @@
import httpx
-from ..types import IPListResponse, ip_list_params
from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from .._utils import (
maybe_transform,
@@ -21,6 +20,7 @@
async_to_streamed_response_wrapper,
)
from .._wrappers import ResultWrapper
+from ..types.ips import IPListResponse, ip_list_params
from .._base_client import (
make_request_options,
)
diff --git a/src/cloudflare/resources/keyless_certificates.py b/src/cloudflare/resources/keyless_certificates.py
index dcf1e3ea495..04dd4d07a97 100644
--- a/src/cloudflare/resources/keyless_certificates.py
+++ b/src/cloudflare/resources/keyless_certificates.py
@@ -6,15 +6,6 @@
import httpx
-from ..types import (
- TunnelParam,
- BundleMethod,
- KeylessCertificate,
- KeylessCertificateDeleteResponse,
- keyless_certificate_edit_params,
- keyless_certificate_create_params,
- keyless_certificate_delete_params,
-)
from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from .._utils import (
maybe_transform,
@@ -34,6 +25,15 @@
AsyncPaginator,
make_request_options,
)
+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,
+)
__all__ = ["KeylessCertificates", "AsyncKeylessCertificates"]
diff --git a/src/cloudflare/resources/load_balancers/load_balancers.py b/src/cloudflare/resources/load_balancers/load_balancers.py
index 9e31221e05d..996379bb342 100644
--- a/src/cloudflare/resources/load_balancers/load_balancers.py
+++ b/src/cloudflare/resources/load_balancers/load_balancers.py
@@ -15,20 +15,6 @@
PoolsWithStreamingResponse,
AsyncPoolsWithStreamingResponse,
)
-from ...types 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 .regions import (
Regions,
AsyncRegions,
@@ -82,6 +68,20 @@
make_request_options,
)
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,
+)
__all__ = ["LoadBalancers", "AsyncLoadBalancers"]
diff --git a/src/cloudflare/resources/load_balancers/pools/pools.py b/src/cloudflare/resources/load_balancers/pools/pools.py
index a2ff1ad7464..fc9b5337e4a 100644
--- a/src/cloudflare/resources/load_balancers/pools/pools.py
+++ b/src/cloudflare/resources/load_balancers/pools/pools.py
@@ -14,13 +14,6 @@
HealthWithStreamingResponse,
AsyncHealthWithStreamingResponse,
)
-from ....types import (
- CheckRegion,
- OriginParam,
- LoadSheddingParam,
- OriginSteeringParam,
- NotificationFilterParam,
-)
from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ...._utils import (
maybe_transform,
@@ -50,7 +43,12 @@
)
from ....types.load_balancers import (
Pool,
+ CheckRegion,
+ OriginParam,
+ LoadSheddingParam,
PoolDeleteResponse,
+ OriginSteeringParam,
+ NotificationFilterParam,
pool_edit_params,
pool_list_params,
pool_create_params,
diff --git a/src/cloudflare/resources/magic_transit/gre_tunnels.py b/src/cloudflare/resources/magic_transit/gre_tunnels.py
index fba8e553040..7830ca2be90 100644
--- a/src/cloudflare/resources/magic_transit/gre_tunnels.py
+++ b/src/cloudflare/resources/magic_transit/gre_tunnels.py
@@ -6,7 +6,6 @@
import httpx
-from ...types import HealthCheckParam
from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ..._utils import (
maybe_transform,
@@ -25,6 +24,7 @@
make_request_options,
)
from ...types.magic_transit import (
+ HealthCheckParam,
GRETunnelGetResponse,
GRETunnelListResponse,
GRETunnelCreateResponse,
diff --git a/src/cloudflare/resources/magic_transit/ipsec_tunnels.py b/src/cloudflare/resources/magic_transit/ipsec_tunnels.py
index ea120195b61..2758342bfed 100644
--- a/src/cloudflare/resources/magic_transit/ipsec_tunnels.py
+++ b/src/cloudflare/resources/magic_transit/ipsec_tunnels.py
@@ -6,7 +6,6 @@
import httpx
-from ...types import HealthCheckParam
from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ..._utils import (
maybe_transform,
@@ -25,6 +24,7 @@
make_request_options,
)
from ...types.magic_transit import (
+ HealthCheckParam,
IPSECTunnelGetResponse,
IPSECTunnelListResponse,
IPSECTunnelCreateResponse,
diff --git a/src/cloudflare/resources/managed_headers.py b/src/cloudflare/resources/managed_headers.py
index 2ef53643588..611d90a6535 100644
--- a/src/cloudflare/resources/managed_headers.py
+++ b/src/cloudflare/resources/managed_headers.py
@@ -6,12 +6,6 @@
import httpx
-from ..types import (
- RequestModelParam,
- ManagedHeaderEditResponse,
- ManagedHeaderListResponse,
- managed_header_edit_params,
-)
from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from .._utils import (
maybe_transform,
@@ -28,6 +22,12 @@
from .._base_client import (
make_request_options,
)
+from ..types.managed_headers import (
+ RequestModelParam,
+ ManagedHeaderEditResponse,
+ ManagedHeaderListResponse,
+ managed_header_edit_params,
+)
__all__ = ["ManagedHeaders", "AsyncManagedHeaders"]
diff --git a/src/cloudflare/resources/memberships.py b/src/cloudflare/resources/memberships.py
index b8eef5abc76..14796f005a4 100644
--- a/src/cloudflare/resources/memberships.py
+++ b/src/cloudflare/resources/memberships.py
@@ -7,15 +7,6 @@
import httpx
-from ..types import (
- Membership,
- MembershipGetResponse,
- MembershipDeleteResponse,
- MembershipUpdateResponse,
- membership_list_params,
- membership_delete_params,
- membership_update_params,
-)
from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from .._utils import (
maybe_transform,
@@ -35,6 +26,15 @@
AsyncPaginator,
make_request_options,
)
+from ..types.memberships import (
+ Membership,
+ MembershipGetResponse,
+ MembershipDeleteResponse,
+ MembershipUpdateResponse,
+ membership_list_params,
+ membership_delete_params,
+ membership_update_params,
+)
__all__ = ["Memberships", "AsyncMemberships"]
diff --git a/src/cloudflare/resources/mtls_certificates/mtls_certificates.py b/src/cloudflare/resources/mtls_certificates/mtls_certificates.py
index 6495b75b34b..301c518c3e2 100644
--- a/src/cloudflare/resources/mtls_certificates/mtls_certificates.py
+++ b/src/cloudflare/resources/mtls_certificates/mtls_certificates.py
@@ -6,12 +6,6 @@
import httpx
-from ...types import (
- MTLSCertificate,
- MTLSCertificateCreateResponse,
- mtls_certificate_create_params,
- mtls_certificate_delete_params,
-)
from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ..._utils import (
maybe_transform,
@@ -39,6 +33,12 @@
AsyncPaginator,
make_request_options,
)
+from ...types.mtls_certificates import (
+ MTLSCertificate,
+ MTLSCertificateCreateResponse,
+ mtls_certificate_create_params,
+ mtls_certificate_delete_params,
+)
__all__ = ["MTLSCertificates", "AsyncMTLSCertificates"]
diff --git a/src/cloudflare/resources/origin_ca_certificates.py b/src/cloudflare/resources/origin_ca_certificates.py
index 3859b2a5c33..32b479da836 100644
--- a/src/cloudflare/resources/origin_ca_certificates.py
+++ b/src/cloudflare/resources/origin_ca_certificates.py
@@ -7,15 +7,6 @@
import httpx
-from ..types import (
- OriginCACertificate,
- OriginCACertificateGetResponse,
- OriginCACertificateCreateResponse,
- OriginCACertificateDeleteResponse,
- origin_ca_certificate_list_params,
- origin_ca_certificate_create_params,
- origin_ca_certificate_delete_params,
-)
from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from .._utils import (
maybe_transform,
@@ -35,6 +26,15 @@
AsyncPaginator,
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,
+)
__all__ = ["OriginCACertificates", "AsyncOriginCACertificates"]
diff --git a/src/cloudflare/resources/origin_post_quantum_encryption.py b/src/cloudflare/resources/origin_post_quantum_encryption.py
index 084104ad3fa..481ea0b2bb2 100644
--- a/src/cloudflare/resources/origin_post_quantum_encryption.py
+++ b/src/cloudflare/resources/origin_post_quantum_encryption.py
@@ -7,11 +7,6 @@
import httpx
-from ..types import (
- OriginPostQuantumEncryptionGetResponse,
- OriginPostQuantumEncryptionUpdateResponse,
- origin_post_quantum_encryption_update_params,
-)
from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from .._utils import (
maybe_transform,
@@ -29,6 +24,11 @@
from .._base_client import (
make_request_options,
)
+from ..types.origin_post_quantum_encryption import (
+ OriginPostQuantumEncryptionGetResponse,
+ OriginPostQuantumEncryptionUpdateResponse,
+ origin_post_quantum_encryption_update_params,
+)
__all__ = ["OriginPostQuantumEncryption", "AsyncOriginPostQuantumEncryption"]
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 a92d927e632..73b4f4be2fc 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
@@ -6,14 +6,6 @@
import httpx
-from ...types import (
- ZoneAuthenticatedOriginPull,
- OriginTLSClientAuthGetResponse,
- OriginTLSClientAuthCreateResponse,
- OriginTLSClientAuthDeleteResponse,
- origin_tls_client_auth_create_params,
- origin_tls_client_auth_delete_params,
-)
from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ..._utils import (
maybe_transform,
@@ -50,6 +42,14 @@
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,
+)
__all__ = ["OriginTLSClientAuth", "AsyncOriginTLSClientAuth"]
diff --git a/src/cloudflare/resources/page_shield/page_shield.py b/src/cloudflare/resources/page_shield/page_shield.py
index 6ea4f18f024..7d7258a076f 100644
--- a/src/cloudflare/resources/page_shield/page_shield.py
+++ b/src/cloudflare/resources/page_shield/page_shield.py
@@ -6,7 +6,6 @@
import httpx
-from ...types import Setting, PageShieldUpdateResponse, page_shield_update_params
from .scripts import (
Scripts,
AsyncScripts,
@@ -48,6 +47,7 @@
from ..._base_client import (
make_request_options,
)
+from ...types.page_shield import Setting, PageShieldUpdateResponse, page_shield_update_params
__all__ = ["PageShield", "AsyncPageShield"]
diff --git a/src/cloudflare/resources/pagerules/pagerules.py b/src/cloudflare/resources/pagerules/pagerules.py
index 181d22aea68..cf61482af94 100644
--- a/src/cloudflare/resources/pagerules/pagerules.py
+++ b/src/cloudflare/resources/pagerules/pagerules.py
@@ -7,21 +7,6 @@
import httpx
-from ...types 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 import NOT_GIVEN, Body, Query, Headers, NotGiven
from ..._utils import (
maybe_transform,
@@ -47,6 +32,21 @@
from ..._base_client import (
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,
+)
__all__ = ["Pagerules", "AsyncPagerules"]
diff --git a/src/cloudflare/resources/pcaps/pcaps.py b/src/cloudflare/resources/pcaps/pcaps.py
index 7a8afa6643a..7ba2b3094f5 100644
--- a/src/cloudflare/resources/pcaps/pcaps.py
+++ b/src/cloudflare/resources/pcaps/pcaps.py
@@ -7,13 +7,6 @@
import httpx
-from ...types import (
- PCAPFilterParam,
- PCAPGetResponse,
- PCAPListResponse,
- PCAPCreateResponse,
- pcap_create_params,
-)
from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ..._utils import (
required_args,
@@ -46,6 +39,13 @@
)
from ..._wrappers import ResultWrapper
from ...pagination import SyncSinglePage, AsyncSinglePage
+from ...types.pcaps import (
+ PCAPFilterParam,
+ PCAPGetResponse,
+ PCAPListResponse,
+ PCAPCreateResponse,
+ pcap_create_params,
+)
from ..._base_client import (
AsyncPaginator,
make_request_options,
diff --git a/src/cloudflare/resources/plans.py b/src/cloudflare/resources/plans.py
index 8b49136d3df..9b09f1e434a 100644
--- a/src/cloudflare/resources/plans.py
+++ b/src/cloudflare/resources/plans.py
@@ -6,7 +6,6 @@
import httpx
-from ..types import AvailableRatePlan
from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from .._compat import cached_property
from .._resource import SyncAPIResource, AsyncAPIResource
@@ -18,6 +17,7 @@
)
from .._wrappers import ResultWrapper
from ..pagination import SyncSinglePage, AsyncSinglePage
+from ..types.plans import AvailableRatePlan
from .._base_client import (
AsyncPaginator,
make_request_options,
diff --git a/src/cloudflare/resources/queues/queues.py b/src/cloudflare/resources/queues/queues.py
index a77bb705534..3f08826e83b 100644
--- a/src/cloudflare/resources/queues/queues.py
+++ b/src/cloudflare/resources/queues/queues.py
@@ -6,15 +6,6 @@
import httpx
-from ...types import (
- Queue,
- QueueCreated,
- QueueUpdated,
- QueueDeleteResponse,
- queue_create_params,
- queue_delete_params,
- queue_update_params,
-)
from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ..._utils import (
maybe_transform,
@@ -50,6 +41,15 @@
AsyncPaginator,
make_request_options,
)
+from ...types.queues import (
+ Queue,
+ QueueCreated,
+ QueueUpdated,
+ QueueDeleteResponse,
+ queue_create_params,
+ queue_delete_params,
+ queue_update_params,
+)
__all__ = ["Queues", "AsyncQueues"]
diff --git a/src/cloudflare/resources/rate_limits.py b/src/cloudflare/resources/rate_limits.py
index 3f41b23397d..a7316386c06 100644
--- a/src/cloudflare/resources/rate_limits.py
+++ b/src/cloudflare/resources/rate_limits.py
@@ -6,17 +6,6 @@
import httpx
-from ..types import (
- RateLimit,
- RateLimitGetResponse,
- RateLimitEditResponse,
- RateLimitCreateResponse,
- RateLimitDeleteResponse,
- rate_limit_edit_params,
- rate_limit_list_params,
- rate_limit_create_params,
- rate_limit_delete_params,
-)
from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from .._utils import (
maybe_transform,
@@ -36,6 +25,17 @@
AsyncPaginator,
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,
+)
__all__ = ["RateLimits", "AsyncRateLimits"]
diff --git a/src/cloudflare/resources/rate_plans.py b/src/cloudflare/resources/rate_plans.py
index c6e967ff8f5..3fa1d87e3a9 100644
--- a/src/cloudflare/resources/rate_plans.py
+++ b/src/cloudflare/resources/rate_plans.py
@@ -6,7 +6,6 @@
import httpx
-from ..types import RatePlanGetResponse
from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from .._compat import cached_property
from .._resource import SyncAPIResource, AsyncAPIResource
@@ -20,6 +19,7 @@
from .._base_client import (
make_request_options,
)
+from ..types.rate_plans import RatePlanGetResponse
__all__ = ["RatePlans", "AsyncRatePlans"]
diff --git a/src/cloudflare/resources/rulesets/phases/versions.py b/src/cloudflare/resources/rulesets/phases/versions.py
index a1feaee0e15..931ae67aba2 100644
--- a/src/cloudflare/resources/rulesets/phases/versions.py
+++ b/src/cloudflare/resources/rulesets/phases/versions.py
@@ -7,7 +7,6 @@
import httpx
-from ....types import Ruleset
from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ...._compat import cached_property
from ...._resource import SyncAPIResource, AsyncAPIResource
@@ -23,6 +22,7 @@
AsyncPaginator,
make_request_options,
)
+from ....types.rulesets import Ruleset
from ....types.rulesets.phases import VersionGetResponse
__all__ = ["Versions", "AsyncVersions"]
diff --git a/src/cloudflare/resources/rulesets/rulesets.py b/src/cloudflare/resources/rulesets/rulesets.py
index ee36a733746..bfb4d99124d 100644
--- a/src/cloudflare/resources/rulesets/rulesets.py
+++ b/src/cloudflare/resources/rulesets/rulesets.py
@@ -23,14 +23,6 @@
PhasesWithStreamingResponse,
AsyncPhasesWithStreamingResponse,
)
-from ...types import (
- Ruleset,
- RulesetGetResponse,
- RulesetCreateResponse,
- RulesetUpdateResponse,
- ruleset_create_params,
- ruleset_update_params,
-)
from ..._types import NOT_GIVEN, Body, Query, Headers, NoneType, NotGiven
from ..._utils import (
maybe_transform,
@@ -59,6 +51,14 @@
AsyncPaginator,
make_request_options,
)
+from ...types.rulesets import (
+ Ruleset,
+ RulesetGetResponse,
+ RulesetCreateResponse,
+ RulesetUpdateResponse,
+ ruleset_create_params,
+ ruleset_update_params,
+)
from .versions.versions import Versions, AsyncVersions
__all__ = ["Rulesets", "AsyncRulesets"]
diff --git a/src/cloudflare/resources/rulesets/versions/versions.py b/src/cloudflare/resources/rulesets/versions/versions.py
index f7744ec5b8f..062a7b290c1 100644
--- a/src/cloudflare/resources/rulesets/versions/versions.py
+++ b/src/cloudflare/resources/rulesets/versions/versions.py
@@ -14,7 +14,6 @@
ByTagWithStreamingResponse,
AsyncByTagWithStreamingResponse,
)
-from ....types import Ruleset
from ...._types import NOT_GIVEN, Body, Query, Headers, NoneType, NotGiven
from ...._compat import cached_property
from ...._resource import SyncAPIResource, AsyncAPIResource
@@ -30,7 +29,7 @@
AsyncPaginator,
make_request_options,
)
-from ....types.rulesets import VersionGetResponse
+from ....types.rulesets import Ruleset, VersionGetResponse
__all__ = ["Versions", "AsyncVersions"]
diff --git a/src/cloudflare/resources/snippets/snippets.py b/src/cloudflare/resources/snippets/snippets.py
index b0427590db5..b768258c005 100644
--- a/src/cloudflare/resources/snippets/snippets.py
+++ b/src/cloudflare/resources/snippets/snippets.py
@@ -14,7 +14,6 @@
RulesWithStreamingResponse,
AsyncRulesWithStreamingResponse,
)
-from ...types import Snippet, SnippetDeleteResponse, snippet_update_params
from .content import (
Content,
AsyncContent,
@@ -42,6 +41,7 @@
AsyncPaginator,
make_request_options,
)
+from ...types.snippets import Snippet, SnippetDeleteResponse, snippet_update_params
__all__ = ["Snippets", "AsyncSnippets"]
diff --git a/src/cloudflare/resources/spectrum/apps.py b/src/cloudflare/resources/spectrum/apps.py
index d9bfbbabf05..7944b9301b2 100644
--- a/src/cloudflare/resources/spectrum/apps.py
+++ b/src/cloudflare/resources/spectrum/apps.py
@@ -7,12 +7,6 @@
import httpx
-from ...types import (
- DNSParam,
- EdgeIPsParam,
- OriginDNSParam,
- OriginPortParam,
-)
from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ..._utils import (
maybe_transform,
@@ -33,7 +27,11 @@
make_request_options,
)
from ...types.spectrum import (
+ DNSParam,
+ EdgeIPsParam,
AppGetResponse,
+ OriginDNSParam,
+ OriginPortParam,
AppCreateResponse,
AppDeleteResponse,
AppUpdateResponse,
diff --git a/src/cloudflare/resources/speed/speed.py b/src/cloudflare/resources/speed/speed.py
index 3254bb93122..5dbfb8c4b7c 100644
--- a/src/cloudflare/resources/speed/speed.py
+++ b/src/cloudflare/resources/speed/speed.py
@@ -24,13 +24,6 @@
TestsWithStreamingResponse,
AsyncTestsWithStreamingResponse,
)
-from ...types import (
- Trend,
- SpeedDeleteResponse,
- speed_delete_params,
- speed_trends_list_params,
- speed_schedule_get_params,
-)
from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ..._utils import (
maybe_transform,
@@ -53,7 +46,14 @@
async_to_streamed_response_wrapper,
)
from ..._wrappers import ResultWrapper
-from ...types.speed import Schedule
+from ...types.speed import (
+ Trend,
+ Schedule,
+ SpeedDeleteResponse,
+ speed_delete_params,
+ speed_trends_list_params,
+ speed_schedule_get_params,
+)
from ..._base_client import (
make_request_options,
)
diff --git a/src/cloudflare/resources/ssl/analyze.py b/src/cloudflare/resources/ssl/analyze.py
index 33a1710c516..d9972ea0bde 100644
--- a/src/cloudflare/resources/ssl/analyze.py
+++ b/src/cloudflare/resources/ssl/analyze.py
@@ -6,7 +6,6 @@
import httpx
-from ...types import BundleMethod
from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ..._utils import (
maybe_transform,
@@ -25,6 +24,7 @@
from ..._base_client import (
make_request_options,
)
+from ...types.custom_hostnames import BundleMethod
__all__ = ["Analyze", "AsyncAnalyze"]
diff --git a/src/cloudflare/resources/stream/clip.py b/src/cloudflare/resources/stream/clip.py
index 5714a50b91c..8d6efd11fce 100644
--- a/src/cloudflare/resources/stream/clip.py
+++ b/src/cloudflare/resources/stream/clip.py
@@ -6,7 +6,6 @@
import httpx
-from ...types import AllowedOrigins
from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ..._utils import (
maybe_transform,
@@ -24,7 +23,7 @@
from ..._base_client import (
make_request_options,
)
-from ...types.stream import Clip, clip_create_params
+from ...types.stream import Clip, AllowedOrigins, clip_create_params
__all__ = ["ClipResource", "AsyncClipResource"]
diff --git a/src/cloudflare/resources/stream/copy.py b/src/cloudflare/resources/stream/copy.py
index 524050776be..be6453eb5a5 100644
--- a/src/cloudflare/resources/stream/copy.py
+++ b/src/cloudflare/resources/stream/copy.py
@@ -7,7 +7,6 @@
import httpx
-from ...types import Video, AllowedOrigins
from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ..._utils import (
maybe_transform,
@@ -25,7 +24,7 @@
from ..._base_client import (
make_request_options,
)
-from ...types.stream import copy_create_params
+from ...types.stream import Video, AllowedOrigins, copy_create_params
__all__ = ["Copy", "AsyncCopy"]
diff --git a/src/cloudflare/resources/stream/direct_upload.py b/src/cloudflare/resources/stream/direct_upload.py
index ceb5aed33aa..313f45bd819 100644
--- a/src/cloudflare/resources/stream/direct_upload.py
+++ b/src/cloudflare/resources/stream/direct_upload.py
@@ -7,7 +7,6 @@
import httpx
-from ...types import AllowedOrigins
from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ..._utils import (
maybe_transform,
@@ -25,7 +24,7 @@
from ..._base_client import (
make_request_options,
)
-from ...types.stream import DirectUploadCreateResponse, direct_upload_create_params
+from ...types.stream import AllowedOrigins, DirectUploadCreateResponse, direct_upload_create_params
__all__ = ["DirectUpload", "AsyncDirectUpload"]
diff --git a/src/cloudflare/resources/stream/stream.py b/src/cloudflare/resources/stream/stream.py
index 1401773bba5..deabf93ca39 100644
--- a/src/cloudflare/resources/stream/stream.py
+++ b/src/cloudflare/resources/stream/stream.py
@@ -56,7 +56,6 @@
VideosWithStreamingResponse,
AsyncVideosWithStreamingResponse,
)
-from ...types import Video, stream_list_params, stream_create_params, stream_delete_params
from ..._types import NOT_GIVEN, Body, Query, Headers, NoneType, NotGiven
from ..._utils import (
maybe_transform,
@@ -132,6 +131,7 @@
AsyncPaginator,
make_request_options,
)
+from ...types.stream import Video, stream_list_params, stream_create_params, stream_delete_params
from .live_inputs.live_inputs import LiveInputs, AsyncLiveInputs
__all__ = ["Stream", "AsyncStream"]
diff --git a/src/cloudflare/resources/subscriptions.py b/src/cloudflare/resources/subscriptions.py
index 93aa580df86..1c41a6ff504 100644
--- a/src/cloudflare/resources/subscriptions.py
+++ b/src/cloudflare/resources/subscriptions.py
@@ -7,15 +7,6 @@
import httpx
-from ..types import (
- SubscriptionGetResponse,
- SubscriptionCreateResponse,
- SubscriptionDeleteResponse,
- SubscriptionUpdateResponse,
- subscription_create_params,
- subscription_delete_params,
- subscription_update_params,
-)
from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from .._utils import (
maybe_transform,
@@ -41,6 +32,15 @@
AsyncPaginator,
make_request_options,
)
+from ..types.subscriptions import (
+ SubscriptionGetResponse,
+ SubscriptionCreateResponse,
+ SubscriptionDeleteResponse,
+ SubscriptionUpdateResponse,
+ subscription_create_params,
+ subscription_delete_params,
+ subscription_update_params,
+)
__all__ = ["Subscriptions", "AsyncSubscriptions"]
diff --git a/src/cloudflare/resources/url_normalization.py b/src/cloudflare/resources/url_normalization.py
index 7a51ec25fab..e9128e15259 100644
--- a/src/cloudflare/resources/url_normalization.py
+++ b/src/cloudflare/resources/url_normalization.py
@@ -4,11 +4,6 @@
import httpx
-from ..types import (
- URLNormalizationGetResponse,
- URLNormalizationUpdateResponse,
- url_normalization_update_params,
-)
from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from .._utils import (
maybe_transform,
@@ -25,6 +20,11 @@
from .._base_client import (
make_request_options,
)
+from ..types.url_normalization import (
+ URLNormalizationGetResponse,
+ URLNormalizationUpdateResponse,
+ url_normalization_update_params,
+)
__all__ = ["URLNormalization", "AsyncURLNormalization"]
diff --git a/src/cloudflare/resources/url_scanner/url_scanner.py b/src/cloudflare/resources/url_scanner/url_scanner.py
index 1c6f763b68d..49ead0fb512 100644
--- a/src/cloudflare/resources/url_scanner/url_scanner.py
+++ b/src/cloudflare/resources/url_scanner/url_scanner.py
@@ -15,7 +15,6 @@
ScansWithStreamingResponse,
AsyncScansWithStreamingResponse,
)
-from ...types import URLScannerScanResponse, url_scanner_scan_params
from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ..._utils import (
maybe_transform,
@@ -33,6 +32,7 @@
from ..._base_client import (
make_request_options,
)
+from ...types.url_scanner import URLScannerScanResponse, url_scanner_scan_params
__all__ = ["URLScanner", "AsyncURLScanner"]
diff --git a/src/cloudflare/resources/user/user.py b/src/cloudflare/resources/user/user.py
index 659324ac2fe..4a88924e47b 100644
--- a/src/cloudflare/resources/user/user.py
+++ b/src/cloudflare/resources/user/user.py
@@ -14,7 +14,6 @@
TokensWithStreamingResponse,
AsyncTokensWithStreamingResponse,
)
-from ...types import UserGetResponse, UserEditResponse, user_edit_params
from .billing import (
Billing,
AsyncBilling,
@@ -53,6 +52,7 @@
async_to_streamed_response_wrapper,
)
from ..._wrappers import ResultWrapper
+from ...types.user import UserGetResponse, UserEditResponse, user_edit_params
from .organizations import (
Organizations,
AsyncOrganizations,
diff --git a/src/cloudflare/resources/waiting_rooms/waiting_rooms.py b/src/cloudflare/resources/waiting_rooms/waiting_rooms.py
index 6eaa5f2a4a7..a8cdbe8d225 100644
--- a/src/cloudflare/resources/waiting_rooms/waiting_rooms.py
+++ b/src/cloudflare/resources/waiting_rooms/waiting_rooms.py
@@ -31,17 +31,6 @@
EventsWithStreamingResponse,
AsyncEventsWithStreamingResponse,
)
-from ...types 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 import NOT_GIVEN, Body, Query, Headers, NotGiven
from ..._utils import (
maybe_transform,
@@ -78,6 +67,17 @@
AsyncPaginator,
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,
+)
__all__ = ["WaitingRooms", "AsyncWaitingRooms"]
diff --git a/src/cloudflare/resources/warp_connector.py b/src/cloudflare/resources/warp_connector.py
index c25a010f0d3..a0c61f162d9 100644
--- a/src/cloudflare/resources/warp_connector.py
+++ b/src/cloudflare/resources/warp_connector.py
@@ -7,18 +7,6 @@
import httpx
-from ..types 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 import NOT_GIVEN, Body, Query, Headers, NotGiven
from .._utils import (
maybe_transform,
@@ -38,6 +26,18 @@
AsyncPaginator,
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,
+)
__all__ = ["WARPConnector", "AsyncWARPConnector"]
diff --git a/src/cloudflare/resources/workers/scripts/content.py b/src/cloudflare/resources/workers/scripts/content.py
index 3d41cbb142a..68875a3dea8 100644
--- a/src/cloudflare/resources/workers/scripts/content.py
+++ b/src/cloudflare/resources/workers/scripts/content.py
@@ -6,7 +6,6 @@
import httpx
-from ....types import WorkerMetadataParam
from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven, FileTypes
from ...._utils import (
extract_files,
@@ -34,7 +33,7 @@
from ...._base_client import (
make_request_options,
)
-from ....types.workers import Script
+from ....types.workers import Script, WorkerMetadataParam
from ....types.workers.scripts import content_update_params
__all__ = ["Content", "AsyncContent"]
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 27b9367c570..1c40f8fcf66 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
@@ -6,7 +6,6 @@
import httpx
-from ......types import WorkerMetadataParam
from ......_types import NOT_GIVEN, Body, Query, Headers, NotGiven, FileTypes
from ......_utils import (
extract_files,
@@ -34,7 +33,7 @@
from ......_base_client import (
make_request_options,
)
-from ......types.workers import Script
+from ......types.workers import Script, WorkerMetadataParam
from ......types.workers_for_platforms.dispatch.namespaces.scripts import content_update_params
__all__ = ["Content", "AsyncContent"]
diff --git a/src/cloudflare/resources/zones/zones.py b/src/cloudflare/resources/zones/zones.py
index cedf2b8eead..d73eb0e761d 100644
--- a/src/cloudflare/resources/zones/zones.py
+++ b/src/cloudflare/resources/zones/zones.py
@@ -15,7 +15,6 @@
HoldsWithStreamingResponse,
AsyncHoldsWithStreamingResponse,
)
-from ...types import Zone, ZoneDeleteResponse, zone_edit_params, zone_list_params, zone_create_params
from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ..._utils import (
maybe_transform,
@@ -47,6 +46,7 @@
DNSSettingsWithStreamingResponse,
AsyncDNSSettingsWithStreamingResponse,
)
+from ...types.zones import Zone, ZoneDeleteResponse, zone_edit_params, zone_list_params, zone_create_params
from .subscriptions import (
Subscriptions,
AsyncSubscriptions,
diff --git a/src/cloudflare/types/__init__.py b/src/cloudflare/types/__init__.py
index 2d68a93c793..8c087ed683d 100644
--- a/src/cloudflare/types/__init__.py
+++ b/src/cloudflare/types/__init__.py
@@ -2,22 +2,6 @@
from __future__ import annotations
-from .d1 import D1 as D1
-from .dns import DNS as DNS
-from .ips import IPs as IPs
-from .host import Host as Host
-from .info import Info as Info
-from .pcap import PCAP as PCAP
-from .zone import Zone as Zone
-from .queue import Queue as Queue
-from .route import Route as Route
-from .rules import Rules as Rules
-from .trend import Trend as Trend
-from .video import Video as Video
-from .action import Action as Action
-from .dnssec import DNSSEC as DNSSEC
-from .header import Header as Header
-from .origin import Origin as Origin
from .shared import (
Role as Role,
User as User,
@@ -32,317 +16,3 @@
CloudflareTunnel as CloudflareTunnel,
LoadBalancerPreview as LoadBalancerPreview,
)
-from .submit import Submit as Submit
-from .target import Target as Target
-from .tunnel import Tunnel as Tunnel
-from .account import Account as Account
-from .binding import Binding as Binding
-from .methods import Methods as Methods
-from .ruleset import Ruleset as Ruleset
-from .setting import Setting as Setting
-from .snippet import Snippet as Snippet
-from .edge_ips import EdgeIPs as EdgeIPs
-from .settings import Settings as Settings
-from .calls_app import CallsApp as CallsApp
-from .dns_param import DNSParam as DNSParam
-from .page_rule import PageRule as PageRule
-from .rate_plan import RatePlan as RatePlan
-from .d1_binding import D1Binding as D1Binding
-from .dcv_method import DCVMethod as DCVMethod
-from .hyperdrive import Hyperdrive as Hyperdrive
-from .membership import Membership as Membership
-from .origin_dns import OriginDNS as OriginDNS
-from .r2_binding import R2Binding as R2Binding
-from .rate_limit import RateLimit as RateLimit
-from .rule_match import RuleMatch as RuleMatch
-from .healthcheck import Healthcheck as Healthcheck
-from .jdcloud_ips import JDCloudIPs as JDCloudIPs
-from .origin_port import OriginPort as OriginPort
-from .pcap_filter import PCAPFilter as PCAPFilter
-from .route_param import RouteParam as RouteParam
-from .rules_param import RulesParam as RulesParam
-from .scan_status import ScanStatus as ScanStatus
-from .check_region import CheckRegion as CheckRegion
-from .header_param import HeaderParam as HeaderParam
-from .health_check import HealthCheck as HealthCheck
-from .origin_param import OriginParam as OriginParam
-from .target_param import TargetParam as TargetParam
-from .tunnel_param import TunnelParam as TunnelParam
-from .waiting_room import WaitingRoom as WaitingRoom
-from .binding_param import BindingParam as BindingParam
-from .bundle_method import BundleMethod as BundleMethod
-from .configuration import Configuration as Configuration
-from .default_pools import DefaultPools as DefaultPools
-from .load_balancer import LoadBalancer as LoadBalancer
-from .load_shedding import LoadShedding as LoadShedding
-from .queue_created import QueueCreated as QueueCreated
-from .queue_updated import QueueUpdated as QueueUpdated
-from .request_model import RequestModel as RequestModel
-from .edge_ips_param import EdgeIPsParam as EdgeIPsParam
-from .filter_options import FilterOptions as FilterOptions
-from .ip_list_params import IPListParams as IPListParams
-from .labeled_region import LabeledRegion as LabeledRegion
-from .migration_step import MigrationStep as MigrationStep
-from .allowed_origins import AllowedOrigins as AllowedOrigins
-from .firewall_filter import FirewallFilter as FirewallFilter
-from .origin_steering import OriginSteering as OriginSteering
-from .random_steering import RandomSteering as RandomSteering
-from .rate_plan_param import RatePlanParam as RatePlanParam
-from .service_binding import ServiceBinding as ServiceBinding
-from .adaptive_routing import AdaptiveRouting as AdaptiveRouting
-from .d1_binding_param import D1BindingParam as D1BindingParam
-from .geo_restrictions import GeoRestrictions as GeoRestrictions
-from .ip_list_response import IPListResponse as IPListResponse
-from .mtls_certificate import MTLSCertificate as MTLSCertificate
-from .origin_dns_param import OriginDNSParam as OriginDNSParam
-from .r2_binding_param import R2BindingParam as R2BindingParam
-from .user_edit_params import UserEditParams as UserEditParams
-from .zone_edit_params import ZoneEditParams as ZoneEditParams
-from .zone_list_params import ZoneListParams as ZoneListParams
-from .additional_routes import AdditionalRoutes as AdditionalRoutes
-from .cookie_attributes import CookieAttributes as CookieAttributes
-from .custom_nameserver import CustomNameserver as CustomNameserver
-from .health_check_rate import HealthCheckRate as HealthCheckRate
-from .health_check_type import HealthCheckType as HealthCheckType
-from .lighthouse_report import LighthouseReport as LighthouseReport
-from .location_strategy import LocationStrategy as LocationStrategy
-from .mtls_cert_binding import MTLSCERTBinding as MTLSCERTBinding
-from .origin_port_param import OriginPortParam as OriginPortParam
-from .pcap_filter_param import PCAPFilterParam as PCAPFilterParam
-from .pcap_get_response import PCAPGetResponse as PCAPGetResponse
-from .stepped_migration import SteppedMigration as SteppedMigration
-from .tcp_configuration import TCPConfiguration as TCPConfiguration
-from .user_get_response import UserGetResponse as UserGetResponse
-from .cache_purge_params import CachePurgeParams as CachePurgeParams
-from .call_create_params import CallCreateParams as CallCreateParams
-from .call_update_params import CallUpdateParams as CallUpdateParams
-from .client_certificate import ClientCertificate as ClientCertificate
-from .custom_certificate import CustomCertificate as CustomCertificate
-from .dnssec_edit_params import DNSSECEditParams as DNSSECEditParams
-from .filter_list_params import FilterListParams as FilterListParams
-from .health_check_param import HealthCheckParam as HealthCheckParam
-from .http_configuration import HTTPConfiguration as HTTPConfiguration
-from .pcap_create_params import PCAPCreateParams as PCAPCreateParams
-from .pcap_list_response import PCAPListResponse as PCAPListResponse
-from .stream_list_params import StreamListParams as StreamListParams
-from .user_edit_response import UserEditResponse as UserEditResponse
-from .zone_create_params import ZoneCreateParams as ZoneCreateParams
-from .account_list_params import AccountListParams as AccountListParams
-from .available_rate_plan import AvailableRatePlan as AvailableRatePlan
-from .configuration_param import ConfigurationParam as ConfigurationParam
-from .dns_analytics_query import DNSAnalyticsQuery as DNSAnalyticsQuery
-from .keyless_certificate import KeylessCertificate as KeylessCertificate
-from .load_shedding_param import LoadSheddingParam as LoadSheddingParam
-from .notification_filter import NotificationFilter as NotificationFilter
-from .queue_create_params import QueueCreateParams as QueueCreateParams
-from .queue_delete_params import QueueDeleteParams as QueueDeleteParams
-from .queue_update_params import QueueUpdateParams as QueueUpdateParams
-from .request_model_param import RequestModelParam as RequestModelParam
-from .speed_delete_params import SpeedDeleteParams as SpeedDeleteParams
-from .account_get_response import AccountGetResponse as AccountGetResponse
-from .cache_purge_response import CachePurgeResponse as CachePurgeResponse
-from .dnssec_delete_params import DNSSECDeleteParams as DNSSECDeleteParams
-from .filter_create_params import FilterCreateParams as FilterCreateParams
-from .filter_delete_params import FilterDeleteParams as FilterDeleteParams
-from .filter_options_param import FilterOptionsParam as FilterOptionsParam
-from .filter_update_params import FilterUpdateParams as FilterUpdateParams
-from .kv_namespace_binding import KVNamespaceBinding as KVNamespaceBinding
-from .migration_step_param import MigrationStepParam as MigrationStepParam
-from .pagerule_edit_params import PageruleEditParams as PageruleEditParams
-from .pagerule_list_params import PageruleListParams as PageruleListParams
-from .pcap_create_response import PCAPCreateResponse as PCAPCreateResponse
-from .ruleset_get_response import RulesetGetResponse as RulesetGetResponse
-from .stream_create_params import StreamCreateParams as StreamCreateParams
-from .stream_delete_params import StreamDeleteParams as StreamDeleteParams
-from .zone_delete_response import ZoneDeleteResponse as ZoneDeleteResponse
-from .account_update_params import AccountUpdateParams as AccountUpdateParams
-from .audit_log_list_params import AuditLogListParams as AuditLogListParams
-from .calls_app_with_secret import CallsAppWithSecret as CallsAppWithSecret
-from .origin_ca_certificate import OriginCACertificate as OriginCACertificate
-from .origin_steering_param import OriginSteeringParam as OriginSteeringParam
-from .pagerule_get_response import PageruleGetResponse as PageruleGetResponse
-from .queue_delete_response import QueueDeleteResponse as QueueDeleteResponse
-from .random_steering_param import RandomSteeringParam as RandomSteeringParam
-from .ruleset_create_params import RulesetCreateParams as RulesetCreateParams
-from .ruleset_update_params import RulesetUpdateParams as RulesetUpdateParams
-from .service_binding_param import ServiceBindingParam as ServiceBindingParam
-from .single_step_migration import SingleStepMigration as SingleStepMigration
-from .snippet_update_params import SnippetUpdateParams as SnippetUpdateParams
-from .speed_delete_response import SpeedDeleteResponse as SpeedDeleteResponse
-from .worker_metadata_param import WorkerMetadataParam as WorkerMetadataParam
-from .adaptive_routing_param import AdaptiveRoutingParam as AdaptiveRoutingParam
-from .dnssec_delete_response import DNSSECDeleteResponse as DNSSECDeleteResponse
-from .domain_validation_type import DomainValidationType as DomainValidationType
-from .durable_object_binding import DurableObjectBinding as DurableObjectBinding
-from .filter_create_response import FilterCreateResponse as FilterCreateResponse
-from .geo_restrictions_param import GeoRestrictionsParam as GeoRestrictionsParam
-from .membership_list_params import MembershipListParams as MembershipListParams
-from .pagerule_create_params import PageruleCreateParams as PageruleCreateParams
-from .pagerule_delete_params import PageruleDeleteParams as PageruleDeleteParams
-from .pagerule_edit_response import PageruleEditResponse as PageruleEditResponse
-from .pagerule_list_response import PageruleListResponse as PageruleListResponse
-from .pagerule_update_params import PageruleUpdateParams as PageruleUpdateParams
-from .rate_limit_edit_params import RateLimitEditParams as RateLimitEditParams
-from .rate_limit_list_params import RateLimitListParams as RateLimitListParams
-from .rate_plan_get_response import RatePlanGetResponse as RatePlanGetResponse
-from .url_info_model_results import URLInfoModelResults as URLInfoModelResults
-from .account_update_response import AccountUpdateResponse as AccountUpdateResponse
-from .additional_routes_param import AdditionalRoutesParam as AdditionalRoutesParam
-from .cookie_attributes_param import CookieAttributesParam as CookieAttributesParam
-from .healthcheck_edit_params import HealthcheckEditParams as HealthcheckEditParams
-from .location_strategy_param import LocationStrategyParam as LocationStrategyParam
-from .membership_get_response import MembershipGetResponse as MembershipGetResponse
-from .mtls_cert_binding_param import MTLSCERTBindingParam as MTLSCERTBindingParam
-from .placement_configuration import PlacementConfiguration as PlacementConfiguration
-from .rate_limit_get_response import RateLimitGetResponse as RateLimitGetResponse
-from .ruleset_create_response import RulesetCreateResponse as RulesetCreateResponse
-from .ruleset_update_response import RulesetUpdateResponse as RulesetUpdateResponse
-from .snippet_delete_response import SnippetDeleteResponse as SnippetDeleteResponse
-from .stepped_migration_param import SteppedMigrationParam as SteppedMigrationParam
-from .tcp_configuration_param import TCPConfigurationParam as TCPConfigurationParam
-from .url_scanner_scan_params import URLScannerScanParams as URLScannerScanParams
-from .http_configuration_param import HTTPConfigurationParam as HTTPConfigurationParam
-from .membership_delete_params import MembershipDeleteParams as MembershipDeleteParams
-from .membership_update_params import MembershipUpdateParams as MembershipUpdateParams
-from .pagerule_create_response import PageruleCreateResponse as PageruleCreateResponse
-from .pagerule_delete_response import PageruleDeleteResponse as PageruleDeleteResponse
-from .pagerule_update_response import PageruleUpdateResponse as PageruleUpdateResponse
-from .rate_limit_create_params import RateLimitCreateParams as RateLimitCreateParams
-from .rate_limit_delete_params import RateLimitDeleteParams as RateLimitDeleteParams
-from .rate_limit_edit_response import RateLimitEditResponse as RateLimitEditResponse
-from .speed_trends_list_params import SpeedTrendsListParams as SpeedTrendsListParams
-from .waiting_room_edit_params import WaitingRoomEditParams as WaitingRoomEditParams
-from .waiting_room_list_params import WaitingRoomListParams as WaitingRoomListParams
-from .healthcheck_create_params import HealthcheckCreateParams as HealthcheckCreateParams
-from .healthcheck_delete_params import HealthcheckDeleteParams as HealthcheckDeleteParams
-from .healthcheck_update_params import HealthcheckUpdateParams as HealthcheckUpdateParams
-from .load_balancer_edit_params import LoadBalancerEditParams as LoadBalancerEditParams
-from .notification_filter_param import NotificationFilterParam as NotificationFilterParam
-from .page_shield_update_params import PageShieldUpdateParams as PageShieldUpdateParams
-from .speed_schedule_get_params import SpeedScheduleGetParams as SpeedScheduleGetParams
-from .subscription_get_response import SubscriptionGetResponse as SubscriptionGetResponse
-from .url_scanner_scan_response import URLScannerScanResponse as URLScannerScanResponse
-from .dispatch_namespace_binding import DispatchNamespaceBinding as DispatchNamespaceBinding
-from .kv_namespace_binding_param import KVNamespaceBindingParam as KVNamespaceBindingParam
-from .managed_header_edit_params import ManagedHeaderEditParams as ManagedHeaderEditParams
-from .membership_delete_response import MembershipDeleteResponse as MembershipDeleteResponse
-from .membership_update_response import MembershipUpdateResponse as MembershipUpdateResponse
-from .rate_limit_create_response import RateLimitCreateResponse as RateLimitCreateResponse
-from .rate_limit_delete_response import RateLimitDeleteResponse as RateLimitDeleteResponse
-from .subscription_configuration import SubscriptionConfiguration as SubscriptionConfiguration
-from .subscription_create_params import SubscriptionCreateParams as SubscriptionCreateParams
-from .subscription_delete_params import SubscriptionDeleteParams as SubscriptionDeleteParams
-from .subscription_update_params import SubscriptionUpdateParams as SubscriptionUpdateParams
-from .waiting_room_create_params import WaitingRoomCreateParams as WaitingRoomCreateParams
-from .waiting_room_delete_params import WaitingRoomDeleteParams as WaitingRoomDeleteParams
-from .waiting_room_update_params import WaitingRoomUpdateParams as WaitingRoomUpdateParams
-from .warp_connector_edit_params import WARPConnectorEditParams as WARPConnectorEditParams
-from .warp_connector_list_params import WARPConnectorListParams as WARPConnectorListParams
-from .bot_management_get_response import BotManagementGetResponse as BotManagementGetResponse
-from .custom_hostname_edit_params import CustomHostnameEditParams as CustomHostnameEditParams
-from .custom_hostname_list_params import CustomHostnameListParams as CustomHostnameListParams
-from .email_routing_enable_params import EmailRoutingEnableParams as EmailRoutingEnableParams
-from .healthcheck_delete_response import HealthcheckDeleteResponse as HealthcheckDeleteResponse
-from .load_balancer_create_params import LoadBalancerCreateParams as LoadBalancerCreateParams
-from .load_balancer_delete_params import LoadBalancerDeleteParams as LoadBalancerDeleteParams
-from .load_balancer_update_params import LoadBalancerUpdateParams as LoadBalancerUpdateParams
-from .page_shield_update_response import PageShieldUpdateResponse as PageShieldUpdateResponse
-from .session_affinity_attributes import SessionAffinityAttributes as SessionAffinityAttributes
-from .single_step_migration_param import SingleStepMigrationParam as SingleStepMigrationParam
-from .warp_connector_get_response import WARPConnectorGetResponse as WARPConnectorGetResponse
-from .bot_fight_mode_configuration import BotFightModeConfiguration as BotFightModeConfiguration
-from .bot_management_update_params import BotManagementUpdateParams as BotManagementUpdateParams
-from .custom_hostname_get_response import CustomHostnameGetResponse as CustomHostnameGetResponse
-from .dns_analytics_nominal_metric import DNSAnalyticsNominalMetric as DNSAnalyticsNominalMetric
-from .durable_object_binding_param import DurableObjectBindingParam as DurableObjectBindingParam
-from .email_routing_disable_params import EmailRoutingDisableParams as EmailRoutingDisableParams
-from .managed_header_edit_response import ManagedHeaderEditResponse as ManagedHeaderEditResponse
-from .managed_header_list_response import ManagedHeaderListResponse as ManagedHeaderListResponse
-from .subscription_create_response import SubscriptionCreateResponse as SubscriptionCreateResponse
-from .subscription_delete_response import SubscriptionDeleteResponse as SubscriptionDeleteResponse
-from .subscription_update_response import SubscriptionUpdateResponse as SubscriptionUpdateResponse
-from .waiting_room_delete_response import WaitingRoomDeleteResponse as WaitingRoomDeleteResponse
-from .warp_connector_create_params import WARPConnectorCreateParams as WARPConnectorCreateParams
-from .warp_connector_delete_params import WARPConnectorDeleteParams as WARPConnectorDeleteParams
-from .warp_connector_edit_response import WARPConnectorEditResponse as WARPConnectorEditResponse
-from .warp_connector_list_response import WARPConnectorListResponse as WARPConnectorListResponse
-from .custom_hostname_create_params import CustomHostnameCreateParams as CustomHostnameCreateParams
-from .custom_hostname_delete_params import CustomHostnameDeleteParams as CustomHostnameDeleteParams
-from .custom_hostname_edit_response import CustomHostnameEditResponse as CustomHostnameEditResponse
-from .custom_hostname_list_response import CustomHostnameListResponse as CustomHostnameListResponse
-from .load_balancer_delete_response import LoadBalancerDeleteResponse as LoadBalancerDeleteResponse
-from .placement_configuration_param import PlacementConfigurationParam as PlacementConfigurationParam
-from .warp_connector_token_response import WARPConnectorTokenResponse as WARPConnectorTokenResponse
-from .bot_management_update_response import BotManagementUpdateResponse as BotManagementUpdateResponse
-from .brand_protection_submit_params import BrandProtectionSubmitParams as BrandProtectionSubmitParams
-from .client_certificate_list_params import ClientCertificateListParams as ClientCertificateListParams
-from .custom_certificate_edit_params import CustomCertificateEditParams as CustomCertificateEditParams
-from .custom_certificate_list_params import CustomCertificateListParams as CustomCertificateListParams
-from .custom_nameserver_get_response import CustomNameserverGetResponse as CustomNameserverGetResponse
-from .mtls_certificate_create_params import MTLSCertificateCreateParams as MTLSCertificateCreateParams
-from .mtls_certificate_delete_params import MTLSCertificateDeleteParams as MTLSCertificateDeleteParams
-from .url_normalization_get_response import URLNormalizationGetResponse as URLNormalizationGetResponse
-from .warp_connector_create_response import WARPConnectorCreateResponse as WARPConnectorCreateResponse
-from .warp_connector_delete_response import WARPConnectorDeleteResponse as WARPConnectorDeleteResponse
-from .zone_authenticated_origin_pull import ZoneAuthenticatedOriginPull as ZoneAuthenticatedOriginPull
-from .custom_certificate_get_response import CustomCertificateGetResponse as CustomCertificateGetResponse
-from .custom_hostname_create_response import CustomHostnameCreateResponse as CustomHostnameCreateResponse
-from .custom_hostname_delete_response import CustomHostnameDeleteResponse as CustomHostnameDeleteResponse
-from .custom_nameserver_create_params import CustomNameserverCreateParams as CustomNameserverCreateParams
-from .custom_nameserver_delete_params import CustomNameserverDeleteParams as CustomNameserverDeleteParams
-from .custom_nameserver_verify_params import CustomNameserverVerifyParams as CustomNameserverVerifyParams
-from .keyless_certificate_edit_params import KeylessCertificateEditParams as KeylessCertificateEditParams
-from .url_normalization_update_params import URLNormalizationUpdateParams as URLNormalizationUpdateParams
-from .brand_protection_url_info_params import BrandProtectionURLInfoParams as BrandProtectionURLInfoParams
-from .client_certificate_create_params import ClientCertificateCreateParams as ClientCertificateCreateParams
-from .custom_certificate_create_params import CustomCertificateCreateParams as CustomCertificateCreateParams
-from .custom_certificate_delete_params import CustomCertificateDeleteParams as CustomCertificateDeleteParams
-from .custom_certificate_edit_response import CustomCertificateEditResponse as CustomCertificateEditResponse
-from .dispatch_namespace_binding_param import DispatchNamespaceBindingParam as DispatchNamespaceBindingParam
-from .mtls_certificate_create_response import MTLSCertificateCreateResponse as MTLSCertificateCreateResponse
-from .custom_nameserver_delete_response import CustomNameserverDeleteResponse as CustomNameserverDeleteResponse
-from .custom_nameserver_verify_response import CustomNameserverVerifyResponse as CustomNameserverVerifyResponse
-from .keyless_certificate_create_params import KeylessCertificateCreateParams as KeylessCertificateCreateParams
-from .keyless_certificate_delete_params import KeylessCertificateDeleteParams as KeylessCertificateDeleteParams
-from .origin_ca_certificate_list_params import OriginCACertificateListParams as OriginCACertificateListParams
-from .session_affinity_attributes_param import SessionAffinityAttributesParam as SessionAffinityAttributesParam
-from .url_normalization_update_response import URLNormalizationUpdateResponse as URLNormalizationUpdateResponse
-from .custom_certificate_create_response import CustomCertificateCreateResponse as CustomCertificateCreateResponse
-from .custom_certificate_delete_response import CustomCertificateDeleteResponse as CustomCertificateDeleteResponse
-from .origin_ca_certificate_get_response import OriginCACertificateGetResponse as OriginCACertificateGetResponse
-from .keyless_certificate_delete_response import KeylessCertificateDeleteResponse as KeylessCertificateDeleteResponse
-from .origin_ca_certificate_create_params import OriginCACertificateCreateParams as OriginCACertificateCreateParams
-from .origin_ca_certificate_delete_params import OriginCACertificateDeleteParams as OriginCACertificateDeleteParams
-from .origin_tls_client_auth_get_response import OriginTLSClientAuthGetResponse as OriginTLSClientAuthGetResponse
-from .origin_tls_client_auth_create_params import OriginTLSClientAuthCreateParams as OriginTLSClientAuthCreateParams
-from .origin_tls_client_auth_delete_params import OriginTLSClientAuthDeleteParams as OriginTLSClientAuthDeleteParams
-from .origin_ca_certificate_create_response import (
- OriginCACertificateCreateResponse as OriginCACertificateCreateResponse,
-)
-from .origin_ca_certificate_delete_response import (
- OriginCACertificateDeleteResponse as OriginCACertificateDeleteResponse,
-)
-from .custom_nameserver_availabilty_response import (
- CustomNameserverAvailabiltyResponse as CustomNameserverAvailabiltyResponse,
-)
-from .origin_tls_client_auth_create_response import (
- OriginTLSClientAuthCreateResponse as OriginTLSClientAuthCreateResponse,
-)
-from .origin_tls_client_auth_delete_response import (
- OriginTLSClientAuthDeleteResponse as OriginTLSClientAuthDeleteResponse,
-)
-from .super_bot_fight_mode_likely_configuration import (
- SuperBotFightModeLikelyConfiguration as SuperBotFightModeLikelyConfiguration,
-)
-from .origin_post_quantum_encryption_get_response import (
- OriginPostQuantumEncryptionGetResponse as OriginPostQuantumEncryptionGetResponse,
-)
-from .origin_post_quantum_encryption_update_params import (
- OriginPostQuantumEncryptionUpdateParams as OriginPostQuantumEncryptionUpdateParams,
-)
-from .super_bot_fight_mode_definitely_configuration import (
- SuperBotFightModeDefinitelyConfiguration as SuperBotFightModeDefinitelyConfiguration,
-)
-from .origin_post_quantum_encryption_update_response import (
- OriginPostQuantumEncryptionUpdateResponse as OriginPostQuantumEncryptionUpdateResponse,
-)
diff --git a/src/cloudflare/types/accounts/__init__.py b/src/cloudflare/types/accounts/__init__.py
index 07fbe320baa..4df03ede50b 100644
--- a/src/cloudflare/types/accounts/__init__.py
+++ b/src/cloudflare/types/accounts/__init__.py
@@ -2,11 +2,16 @@
from __future__ import annotations
+from .account import Account as Account
from .role_get_response import RoleGetResponse as RoleGetResponse
from .member_list_params import MemberListParams as MemberListParams
+from .account_list_params import AccountListParams as AccountListParams
+from .account_get_response import AccountGetResponse as AccountGetResponse
from .member_create_params import MemberCreateParams as MemberCreateParams
from .member_delete_params import MemberDeleteParams as MemberDeleteParams
from .member_list_response import MemberListResponse as MemberListResponse
from .member_update_params import MemberUpdateParams as MemberUpdateParams
+from .account_update_params import AccountUpdateParams as AccountUpdateParams
from .user_with_invite_code import UserWithInviteCode as UserWithInviteCode
from .member_delete_response import MemberDeleteResponse as MemberDeleteResponse
+from .account_update_response import AccountUpdateResponse as AccountUpdateResponse
diff --git a/src/cloudflare/types/account.py b/src/cloudflare/types/accounts/account.py
similarity index 97%
rename from src/cloudflare/types/account.py
rename to src/cloudflare/types/accounts/account.py
index 50f42137319..8c402e4bac9 100644
--- a/src/cloudflare/types/account.py
+++ b/src/cloudflare/types/accounts/account.py
@@ -4,7 +4,7 @@
from datetime import datetime
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["Account", "Settings"]
diff --git a/src/cloudflare/types/account_get_response.py b/src/cloudflare/types/accounts/account_get_response.py
similarity index 100%
rename from src/cloudflare/types/account_get_response.py
rename to src/cloudflare/types/accounts/account_get_response.py
diff --git a/src/cloudflare/types/account_list_params.py b/src/cloudflare/types/accounts/account_list_params.py
similarity index 100%
rename from src/cloudflare/types/account_list_params.py
rename to src/cloudflare/types/accounts/account_list_params.py
diff --git a/src/cloudflare/types/account_update_params.py b/src/cloudflare/types/accounts/account_update_params.py
similarity index 100%
rename from src/cloudflare/types/account_update_params.py
rename to src/cloudflare/types/accounts/account_update_params.py
diff --git a/src/cloudflare/types/account_update_response.py b/src/cloudflare/types/accounts/account_update_response.py
similarity index 100%
rename from src/cloudflare/types/account_update_response.py
rename to src/cloudflare/types/accounts/account_update_response.py
diff --git a/src/cloudflare/types/audit_logs/__init__.py b/src/cloudflare/types/audit_logs/__init__.py
new file mode 100644
index 00000000000..15fc240320d
--- /dev/null
+++ b/src/cloudflare/types/audit_logs/__init__.py
@@ -0,0 +1,5 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .audit_log_list_params import AuditLogListParams as AuditLogListParams
diff --git a/src/cloudflare/types/audit_log_list_params.py b/src/cloudflare/types/audit_logs/audit_log_list_params.py
similarity index 98%
rename from src/cloudflare/types/audit_log_list_params.py
rename to src/cloudflare/types/audit_logs/audit_log_list_params.py
index 135c9fa0f2f..3ad70b082c0 100644
--- a/src/cloudflare/types/audit_log_list_params.py
+++ b/src/cloudflare/types/audit_logs/audit_log_list_params.py
@@ -6,7 +6,7 @@
from datetime import datetime
from typing_extensions import Literal, Required, Annotated, TypedDict
-from .._utils import PropertyInfo
+from ..._utils import PropertyInfo
__all__ = ["AuditLogListParams", "Action", "Actor", "Zone"]
diff --git a/src/cloudflare/types/bot_management/__init__.py b/src/cloudflare/types/bot_management/__init__.py
new file mode 100644
index 00000000000..f7225855fc6
--- /dev/null
+++ b/src/cloudflare/types/bot_management/__init__.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .subscription_configuration import SubscriptionConfiguration as SubscriptionConfiguration
+from .bot_management_get_response import BotManagementGetResponse as BotManagementGetResponse
+from .bot_fight_mode_configuration import BotFightModeConfiguration as BotFightModeConfiguration
+from .bot_management_update_params import BotManagementUpdateParams as BotManagementUpdateParams
+from .bot_management_update_response import BotManagementUpdateResponse as BotManagementUpdateResponse
+from .super_bot_fight_mode_likely_configuration import (
+ SuperBotFightModeLikelyConfiguration as SuperBotFightModeLikelyConfiguration,
+)
+from .super_bot_fight_mode_definitely_configuration import (
+ SuperBotFightModeDefinitelyConfiguration as SuperBotFightModeDefinitelyConfiguration,
+)
diff --git a/src/cloudflare/types/bot_fight_mode_configuration.py b/src/cloudflare/types/bot_management/bot_fight_mode_configuration.py
similarity index 95%
rename from src/cloudflare/types/bot_fight_mode_configuration.py
rename to src/cloudflare/types/bot_management/bot_fight_mode_configuration.py
index e7b51148237..ca47e2d1a71 100644
--- a/src/cloudflare/types/bot_fight_mode_configuration.py
+++ b/src/cloudflare/types/bot_management/bot_fight_mode_configuration.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["BotFightModeConfiguration"]
diff --git a/src/cloudflare/types/bot_management_get_response.py b/src/cloudflare/types/bot_management/bot_management_get_response.py
similarity index 100%
rename from src/cloudflare/types/bot_management_get_response.py
rename to src/cloudflare/types/bot_management/bot_management_get_response.py
diff --git a/src/cloudflare/types/bot_management_update_params.py b/src/cloudflare/types/bot_management/bot_management_update_params.py
similarity index 100%
rename from src/cloudflare/types/bot_management_update_params.py
rename to src/cloudflare/types/bot_management/bot_management_update_params.py
diff --git a/src/cloudflare/types/bot_management_update_response.py b/src/cloudflare/types/bot_management/bot_management_update_response.py
similarity index 100%
rename from src/cloudflare/types/bot_management_update_response.py
rename to src/cloudflare/types/bot_management/bot_management_update_response.py
diff --git a/src/cloudflare/types/subscription_configuration.py b/src/cloudflare/types/bot_management/subscription_configuration.py
similarity index 97%
rename from src/cloudflare/types/subscription_configuration.py
rename to src/cloudflare/types/bot_management/subscription_configuration.py
index 19c7a95cbdf..b9734638ceb 100644
--- a/src/cloudflare/types/subscription_configuration.py
+++ b/src/cloudflare/types/bot_management/subscription_configuration.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["SubscriptionConfiguration"]
diff --git a/src/cloudflare/types/super_bot_fight_mode_definitely_configuration.py b/src/cloudflare/types/bot_management/super_bot_fight_mode_definitely_configuration.py
similarity index 97%
rename from src/cloudflare/types/super_bot_fight_mode_definitely_configuration.py
rename to src/cloudflare/types/bot_management/super_bot_fight_mode_definitely_configuration.py
index f03373fffa8..64d6bf32f27 100644
--- a/src/cloudflare/types/super_bot_fight_mode_definitely_configuration.py
+++ b/src/cloudflare/types/bot_management/super_bot_fight_mode_definitely_configuration.py
@@ -3,7 +3,7 @@
from typing import Optional
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["SuperBotFightModeDefinitelyConfiguration"]
diff --git a/src/cloudflare/types/super_bot_fight_mode_likely_configuration.py b/src/cloudflare/types/bot_management/super_bot_fight_mode_likely_configuration.py
similarity index 97%
rename from src/cloudflare/types/super_bot_fight_mode_likely_configuration.py
rename to src/cloudflare/types/bot_management/super_bot_fight_mode_likely_configuration.py
index a0e1ceb8d6d..c0878cfdf0a 100644
--- a/src/cloudflare/types/super_bot_fight_mode_likely_configuration.py
+++ b/src/cloudflare/types/bot_management/super_bot_fight_mode_likely_configuration.py
@@ -3,7 +3,7 @@
from typing import Optional
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["SuperBotFightModeLikelyConfiguration"]
diff --git a/src/cloudflare/types/brand_protection/__init__.py b/src/cloudflare/types/brand_protection/__init__.py
new file mode 100644
index 00000000000..3fa7ed724bd
--- /dev/null
+++ b/src/cloudflare/types/brand_protection/__init__.py
@@ -0,0 +1,11 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .info import Info as Info
+from .submit import Submit as Submit
+from .rule_match import RuleMatch as RuleMatch
+from .scan_status import ScanStatus as ScanStatus
+from .url_info_model_results import URLInfoModelResults as URLInfoModelResults
+from .brand_protection_submit_params import BrandProtectionSubmitParams as BrandProtectionSubmitParams
+from .brand_protection_url_info_params import BrandProtectionURLInfoParams as BrandProtectionURLInfoParams
diff --git a/src/cloudflare/types/brand_protection_submit_params.py b/src/cloudflare/types/brand_protection/brand_protection_submit_params.py
similarity index 100%
rename from src/cloudflare/types/brand_protection_submit_params.py
rename to src/cloudflare/types/brand_protection/brand_protection_submit_params.py
diff --git a/src/cloudflare/types/brand_protection_url_info_params.py b/src/cloudflare/types/brand_protection/brand_protection_url_info_params.py
similarity index 100%
rename from src/cloudflare/types/brand_protection_url_info_params.py
rename to src/cloudflare/types/brand_protection/brand_protection_url_info_params.py
diff --git a/src/cloudflare/types/info.py b/src/cloudflare/types/brand_protection/info.py
similarity index 97%
rename from src/cloudflare/types/info.py
rename to src/cloudflare/types/brand_protection/info.py
index cf5180c39ae..ecc27c62f00 100644
--- a/src/cloudflare/types/info.py
+++ b/src/cloudflare/types/brand_protection/info.py
@@ -4,7 +4,7 @@
from pydantic import Field as FieldInfo
-from .._models import BaseModel
+from ..._models import BaseModel
from .rule_match import RuleMatch
from .scan_status import ScanStatus
from .url_info_model_results import URLInfoModelResults
diff --git a/src/cloudflare/types/rule_match.py b/src/cloudflare/types/brand_protection/rule_match.py
similarity index 93%
rename from src/cloudflare/types/rule_match.py
rename to src/cloudflare/types/brand_protection/rule_match.py
index 273241cf233..00452de5674 100644
--- a/src/cloudflare/types/rule_match.py
+++ b/src/cloudflare/types/brand_protection/rule_match.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["RuleMatch"]
diff --git a/src/cloudflare/types/scan_status.py b/src/cloudflare/types/brand_protection/scan_status.py
similarity index 94%
rename from src/cloudflare/types/scan_status.py
rename to src/cloudflare/types/brand_protection/scan_status.py
index ddd530e9067..711de0b5ed6 100644
--- a/src/cloudflare/types/scan_status.py
+++ b/src/cloudflare/types/brand_protection/scan_status.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["ScanStatus"]
diff --git a/src/cloudflare/types/submit.py b/src/cloudflare/types/brand_protection/submit.py
similarity index 97%
rename from src/cloudflare/types/submit.py
rename to src/cloudflare/types/brand_protection/submit.py
index d053919f1ef..766580137d5 100644
--- a/src/cloudflare/types/submit.py
+++ b/src/cloudflare/types/brand_protection/submit.py
@@ -2,7 +2,7 @@
from typing import List, Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["Submit", "ExcludedURL", "SkippedURL", "SubmittedURL"]
diff --git a/src/cloudflare/types/url_info_model_results.py b/src/cloudflare/types/brand_protection/url_info_model_results.py
similarity index 93%
rename from src/cloudflare/types/url_info_model_results.py
rename to src/cloudflare/types/brand_protection/url_info_model_results.py
index 539650a1ac8..cd2086aba49 100644
--- a/src/cloudflare/types/url_info_model_results.py
+++ b/src/cloudflare/types/brand_protection/url_info_model_results.py
@@ -4,7 +4,7 @@
from pydantic import Field as FieldInfo
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["URLInfoModelResults"]
diff --git a/src/cloudflare/types/cache/__init__.py b/src/cloudflare/types/cache/__init__.py
index e44ff699ecd..203e43955f7 100644
--- a/src/cloudflare/types/cache/__init__.py
+++ b/src/cloudflare/types/cache/__init__.py
@@ -4,8 +4,10 @@
from .cache_reserve import CacheReserve as CacheReserve
from .cache_variant import CacheVariant as CacheVariant
+from .cache_purge_params import CachePurgeParams as CachePurgeParams
from .cache_reserve_clear import CacheReserveClear as CacheReserveClear
from .variant_edit_params import VariantEditParams as VariantEditParams
+from .cache_purge_response import CachePurgeResponse as CachePurgeResponse
from .variant_get_response import VariantGetResponse as VariantGetResponse
from .regional_tiered_cache import RegionalTieredCache as RegionalTieredCache
from .variant_delete_params import VariantDeleteParams as VariantDeleteParams
diff --git a/src/cloudflare/types/cache_purge_params.py b/src/cloudflare/types/cache/cache_purge_params.py
similarity index 100%
rename from src/cloudflare/types/cache_purge_params.py
rename to src/cloudflare/types/cache/cache_purge_params.py
diff --git a/src/cloudflare/types/cache_purge_response.py b/src/cloudflare/types/cache/cache_purge_response.py
similarity index 85%
rename from src/cloudflare/types/cache_purge_response.py
rename to src/cloudflare/types/cache/cache_purge_response.py
index c95b2e9864c..08e7ee41a89 100644
--- a/src/cloudflare/types/cache_purge_response.py
+++ b/src/cloudflare/types/cache/cache_purge_response.py
@@ -1,6 +1,6 @@
# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["CachePurgeResponse"]
diff --git a/src/cloudflare/types/calls/__init__.py b/src/cloudflare/types/calls/__init__.py
new file mode 100644
index 00000000000..b3889df1cbc
--- /dev/null
+++ b/src/cloudflare/types/calls/__init__.py
@@ -0,0 +1,8 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .calls_app import CallsApp as CallsApp
+from .call_create_params import CallCreateParams as CallCreateParams
+from .call_update_params import CallUpdateParams as CallUpdateParams
+from .calls_app_with_secret import CallsAppWithSecret as CallsAppWithSecret
diff --git a/src/cloudflare/types/call_create_params.py b/src/cloudflare/types/calls/call_create_params.py
similarity index 100%
rename from src/cloudflare/types/call_create_params.py
rename to src/cloudflare/types/calls/call_create_params.py
diff --git a/src/cloudflare/types/call_update_params.py b/src/cloudflare/types/calls/call_update_params.py
similarity index 100%
rename from src/cloudflare/types/call_update_params.py
rename to src/cloudflare/types/calls/call_update_params.py
diff --git a/src/cloudflare/types/calls_app.py b/src/cloudflare/types/calls/calls_app.py
similarity index 94%
rename from src/cloudflare/types/calls_app.py
rename to src/cloudflare/types/calls/calls_app.py
index 4adb2b4172a..e29517063f6 100644
--- a/src/cloudflare/types/calls_app.py
+++ b/src/cloudflare/types/calls/calls_app.py
@@ -3,7 +3,7 @@
from typing import Optional
from datetime import datetime
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["CallsApp"]
diff --git a/src/cloudflare/types/calls_app_with_secret.py b/src/cloudflare/types/calls/calls_app_with_secret.py
similarity index 95%
rename from src/cloudflare/types/calls_app_with_secret.py
rename to src/cloudflare/types/calls/calls_app_with_secret.py
index e3bab36d3d3..820a8080f27 100644
--- a/src/cloudflare/types/calls_app_with_secret.py
+++ b/src/cloudflare/types/calls/calls_app_with_secret.py
@@ -3,7 +3,7 @@
from typing import Optional
from datetime import datetime
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["CallsAppWithSecret"]
diff --git a/src/cloudflare/types/client_certificates/__init__.py b/src/cloudflare/types/client_certificates/__init__.py
new file mode 100644
index 00000000000..a7c9d42fe40
--- /dev/null
+++ b/src/cloudflare/types/client_certificates/__init__.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .client_certificate import ClientCertificate as ClientCertificate
+from .client_certificate_list_params import ClientCertificateListParams as ClientCertificateListParams
+from .client_certificate_create_params import ClientCertificateCreateParams as ClientCertificateCreateParams
diff --git a/src/cloudflare/types/client_certificate.py b/src/cloudflare/types/client_certificates/client_certificate.py
similarity index 98%
rename from src/cloudflare/types/client_certificate.py
rename to src/cloudflare/types/client_certificates/client_certificate.py
index 3bdc1070a2e..426e5838446 100644
--- a/src/cloudflare/types/client_certificate.py
+++ b/src/cloudflare/types/client_certificates/client_certificate.py
@@ -3,7 +3,7 @@
from typing import Optional
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["ClientCertificate", "CertificateAuthority"]
diff --git a/src/cloudflare/types/client_certificate_create_params.py b/src/cloudflare/types/client_certificates/client_certificate_create_params.py
similarity index 100%
rename from src/cloudflare/types/client_certificate_create_params.py
rename to src/cloudflare/types/client_certificates/client_certificate_create_params.py
diff --git a/src/cloudflare/types/client_certificate_list_params.py b/src/cloudflare/types/client_certificates/client_certificate_list_params.py
similarity index 100%
rename from src/cloudflare/types/client_certificate_list_params.py
rename to src/cloudflare/types/client_certificates/client_certificate_list_params.py
diff --git a/src/cloudflare/types/custom_certificates/__init__.py b/src/cloudflare/types/custom_certificates/__init__.py
index 34164d05981..d6d56312339 100644
--- a/src/cloudflare/types/custom_certificates/__init__.py
+++ b/src/cloudflare/types/custom_certificates/__init__.py
@@ -2,5 +2,16 @@
from __future__ import annotations
+from .geo_restrictions import GeoRestrictions as GeoRestrictions
+from .custom_certificate import CustomCertificate as CustomCertificate
+from .geo_restrictions_param import GeoRestrictionsParam as GeoRestrictionsParam
from .prioritize_update_params import PrioritizeUpdateParams as PrioritizeUpdateParams
from .prioritize_update_response import PrioritizeUpdateResponse as PrioritizeUpdateResponse
+from .custom_certificate_edit_params import CustomCertificateEditParams as CustomCertificateEditParams
+from .custom_certificate_list_params import CustomCertificateListParams as CustomCertificateListParams
+from .custom_certificate_get_response import CustomCertificateGetResponse as CustomCertificateGetResponse
+from .custom_certificate_create_params import CustomCertificateCreateParams as CustomCertificateCreateParams
+from .custom_certificate_delete_params import CustomCertificateDeleteParams as CustomCertificateDeleteParams
+from .custom_certificate_edit_response import CustomCertificateEditResponse as CustomCertificateEditResponse
+from .custom_certificate_create_response import CustomCertificateCreateResponse as CustomCertificateCreateResponse
+from .custom_certificate_delete_response import CustomCertificateDeleteResponse as CustomCertificateDeleteResponse
diff --git a/src/cloudflare/types/custom_certificate.py b/src/cloudflare/types/custom_certificates/custom_certificate.py
similarity index 95%
rename from src/cloudflare/types/custom_certificate.py
rename to src/cloudflare/types/custom_certificates/custom_certificate.py
index 34d0d0fd51b..57aed85168c 100644
--- a/src/cloudflare/types/custom_certificate.py
+++ b/src/cloudflare/types/custom_certificates/custom_certificate.py
@@ -4,10 +4,10 @@
from datetime import datetime
from typing_extensions import Literal
-from .._models import BaseModel
-from .bundle_method import BundleMethod
+from ..._models import BaseModel
from .geo_restrictions import GeoRestrictions
-from .keyless_certificate import KeylessCertificate
+from ..custom_hostnames import BundleMethod
+from ..keyless_certificates import KeylessCertificate
__all__ = ["CustomCertificate"]
diff --git a/src/cloudflare/types/custom_certificate_create_params.py b/src/cloudflare/types/custom_certificates/custom_certificate_create_params.py
similarity index 98%
rename from src/cloudflare/types/custom_certificate_create_params.py
rename to src/cloudflare/types/custom_certificates/custom_certificate_create_params.py
index 7c9dfd6e61b..00957f0d660 100644
--- a/src/cloudflare/types/custom_certificate_create_params.py
+++ b/src/cloudflare/types/custom_certificates/custom_certificate_create_params.py
@@ -4,7 +4,7 @@
from typing_extensions import Literal, Required, TypedDict
-from .bundle_method import BundleMethod
+from ..custom_hostnames import BundleMethod
from .geo_restrictions_param import GeoRestrictionsParam
__all__ = ["CustomCertificateCreateParams"]
diff --git a/src/cloudflare/types/custom_certificate_create_response.py b/src/cloudflare/types/custom_certificates/custom_certificate_create_response.py
similarity index 100%
rename from src/cloudflare/types/custom_certificate_create_response.py
rename to src/cloudflare/types/custom_certificates/custom_certificate_create_response.py
diff --git a/src/cloudflare/types/custom_certificate_delete_params.py b/src/cloudflare/types/custom_certificates/custom_certificate_delete_params.py
similarity index 100%
rename from src/cloudflare/types/custom_certificate_delete_params.py
rename to src/cloudflare/types/custom_certificates/custom_certificate_delete_params.py
diff --git a/src/cloudflare/types/custom_certificate_delete_response.py b/src/cloudflare/types/custom_certificates/custom_certificate_delete_response.py
similarity index 88%
rename from src/cloudflare/types/custom_certificate_delete_response.py
rename to src/cloudflare/types/custom_certificates/custom_certificate_delete_response.py
index 5c1e68f5ba8..0f730c57cbc 100644
--- a/src/cloudflare/types/custom_certificate_delete_response.py
+++ b/src/cloudflare/types/custom_certificates/custom_certificate_delete_response.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["CustomCertificateDeleteResponse"]
diff --git a/src/cloudflare/types/custom_certificate_edit_params.py b/src/cloudflare/types/custom_certificates/custom_certificate_edit_params.py
similarity index 97%
rename from src/cloudflare/types/custom_certificate_edit_params.py
rename to src/cloudflare/types/custom_certificates/custom_certificate_edit_params.py
index 7cb02a59ab3..82ce5454c7f 100644
--- a/src/cloudflare/types/custom_certificate_edit_params.py
+++ b/src/cloudflare/types/custom_certificates/custom_certificate_edit_params.py
@@ -4,7 +4,7 @@
from typing_extensions import Required, TypedDict
-from .bundle_method import BundleMethod
+from ..custom_hostnames import BundleMethod
from .geo_restrictions_param import GeoRestrictionsParam
__all__ = ["CustomCertificateEditParams"]
diff --git a/src/cloudflare/types/custom_certificate_edit_response.py b/src/cloudflare/types/custom_certificates/custom_certificate_edit_response.py
similarity index 100%
rename from src/cloudflare/types/custom_certificate_edit_response.py
rename to src/cloudflare/types/custom_certificates/custom_certificate_edit_response.py
diff --git a/src/cloudflare/types/custom_certificate_get_response.py b/src/cloudflare/types/custom_certificates/custom_certificate_get_response.py
similarity index 100%
rename from src/cloudflare/types/custom_certificate_get_response.py
rename to src/cloudflare/types/custom_certificates/custom_certificate_get_response.py
diff --git a/src/cloudflare/types/custom_certificate_list_params.py b/src/cloudflare/types/custom_certificates/custom_certificate_list_params.py
similarity index 100%
rename from src/cloudflare/types/custom_certificate_list_params.py
rename to src/cloudflare/types/custom_certificates/custom_certificate_list_params.py
diff --git a/src/cloudflare/types/geo_restrictions.py b/src/cloudflare/types/custom_certificates/geo_restrictions.py
similarity index 89%
rename from src/cloudflare/types/geo_restrictions.py
rename to src/cloudflare/types/custom_certificates/geo_restrictions.py
index 95d43ffc898..05462d8d2f8 100644
--- a/src/cloudflare/types/geo_restrictions.py
+++ b/src/cloudflare/types/custom_certificates/geo_restrictions.py
@@ -3,7 +3,7 @@
from typing import Optional
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["GeoRestrictions"]
diff --git a/src/cloudflare/types/geo_restrictions_param.py b/src/cloudflare/types/custom_certificates/geo_restrictions_param.py
similarity index 100%
rename from src/cloudflare/types/geo_restrictions_param.py
rename to src/cloudflare/types/custom_certificates/geo_restrictions_param.py
diff --git a/src/cloudflare/types/custom_certificates/prioritize_update_response.py b/src/cloudflare/types/custom_certificates/prioritize_update_response.py
index e2c917ce3ee..c61eef0af1a 100644
--- a/src/cloudflare/types/custom_certificates/prioritize_update_response.py
+++ b/src/cloudflare/types/custom_certificates/prioritize_update_response.py
@@ -2,7 +2,7 @@
from typing import List
-from ..custom_certificate import CustomCertificate
+from .custom_certificate import CustomCertificate
__all__ = ["PrioritizeUpdateResponse"]
diff --git a/src/cloudflare/types/custom_hostnames/__init__.py b/src/cloudflare/types/custom_hostnames/__init__.py
index da94f2c93ee..ba95ee9a287 100644
--- a/src/cloudflare/types/custom_hostnames/__init__.py
+++ b/src/cloudflare/types/custom_hostnames/__init__.py
@@ -2,8 +2,20 @@
from __future__ import annotations
+from .dcv_method import DCVMethod as DCVMethod
+from .bundle_method import BundleMethod as BundleMethod
+from .domain_validation_type import DomainValidationType as DomainValidationType
+from .custom_hostname_edit_params import CustomHostnameEditParams as CustomHostnameEditParams
+from .custom_hostname_list_params import CustomHostnameListParams as CustomHostnameListParams
+from .custom_hostname_get_response import CustomHostnameGetResponse as CustomHostnameGetResponse
from .fallback_origin_get_response import FallbackOriginGetResponse as FallbackOriginGetResponse
+from .custom_hostname_create_params import CustomHostnameCreateParams as CustomHostnameCreateParams
+from .custom_hostname_delete_params import CustomHostnameDeleteParams as CustomHostnameDeleteParams
+from .custom_hostname_edit_response import CustomHostnameEditResponse as CustomHostnameEditResponse
+from .custom_hostname_list_response import CustomHostnameListResponse as CustomHostnameListResponse
from .fallback_origin_delete_params import FallbackOriginDeleteParams as FallbackOriginDeleteParams
from .fallback_origin_update_params import FallbackOriginUpdateParams as FallbackOriginUpdateParams
+from .custom_hostname_create_response import CustomHostnameCreateResponse as CustomHostnameCreateResponse
+from .custom_hostname_delete_response import CustomHostnameDeleteResponse as CustomHostnameDeleteResponse
from .fallback_origin_delete_response import FallbackOriginDeleteResponse as FallbackOriginDeleteResponse
from .fallback_origin_update_response import FallbackOriginUpdateResponse as FallbackOriginUpdateResponse
diff --git a/src/cloudflare/types/bundle_method.py b/src/cloudflare/types/custom_hostnames/bundle_method.py
similarity index 100%
rename from src/cloudflare/types/bundle_method.py
rename to src/cloudflare/types/custom_hostnames/bundle_method.py
diff --git a/src/cloudflare/types/custom_hostname_create_params.py b/src/cloudflare/types/custom_hostnames/custom_hostname_create_params.py
similarity index 100%
rename from src/cloudflare/types/custom_hostname_create_params.py
rename to src/cloudflare/types/custom_hostnames/custom_hostname_create_params.py
diff --git a/src/cloudflare/types/custom_hostname_create_response.py b/src/cloudflare/types/custom_hostnames/custom_hostname_create_response.py
similarity index 99%
rename from src/cloudflare/types/custom_hostname_create_response.py
rename to src/cloudflare/types/custom_hostnames/custom_hostname_create_response.py
index 049e1243208..236e82ae631 100644
--- a/src/cloudflare/types/custom_hostname_create_response.py
+++ b/src/cloudflare/types/custom_hostnames/custom_hostname_create_response.py
@@ -4,7 +4,7 @@
from datetime import datetime
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
from .dcv_method import DCVMethod
from .bundle_method import BundleMethod
from .domain_validation_type import DomainValidationType
diff --git a/src/cloudflare/types/custom_hostname_delete_params.py b/src/cloudflare/types/custom_hostnames/custom_hostname_delete_params.py
similarity index 100%
rename from src/cloudflare/types/custom_hostname_delete_params.py
rename to src/cloudflare/types/custom_hostnames/custom_hostname_delete_params.py
diff --git a/src/cloudflare/types/custom_hostname_delete_response.py b/src/cloudflare/types/custom_hostnames/custom_hostname_delete_response.py
similarity index 88%
rename from src/cloudflare/types/custom_hostname_delete_response.py
rename to src/cloudflare/types/custom_hostnames/custom_hostname_delete_response.py
index f4a736fa8ce..138a18a96ed 100644
--- a/src/cloudflare/types/custom_hostname_delete_response.py
+++ b/src/cloudflare/types/custom_hostnames/custom_hostname_delete_response.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["CustomHostnameDeleteResponse"]
diff --git a/src/cloudflare/types/custom_hostname_edit_params.py b/src/cloudflare/types/custom_hostnames/custom_hostname_edit_params.py
similarity index 100%
rename from src/cloudflare/types/custom_hostname_edit_params.py
rename to src/cloudflare/types/custom_hostnames/custom_hostname_edit_params.py
diff --git a/src/cloudflare/types/custom_hostname_edit_response.py b/src/cloudflare/types/custom_hostnames/custom_hostname_edit_response.py
similarity index 99%
rename from src/cloudflare/types/custom_hostname_edit_response.py
rename to src/cloudflare/types/custom_hostnames/custom_hostname_edit_response.py
index 89161df0ddf..8697979d1a7 100644
--- a/src/cloudflare/types/custom_hostname_edit_response.py
+++ b/src/cloudflare/types/custom_hostnames/custom_hostname_edit_response.py
@@ -4,7 +4,7 @@
from datetime import datetime
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
from .dcv_method import DCVMethod
from .bundle_method import BundleMethod
from .domain_validation_type import DomainValidationType
diff --git a/src/cloudflare/types/custom_hostname_get_response.py b/src/cloudflare/types/custom_hostnames/custom_hostname_get_response.py
similarity index 99%
rename from src/cloudflare/types/custom_hostname_get_response.py
rename to src/cloudflare/types/custom_hostnames/custom_hostname_get_response.py
index 533984de59a..1b539d1df8e 100644
--- a/src/cloudflare/types/custom_hostname_get_response.py
+++ b/src/cloudflare/types/custom_hostnames/custom_hostname_get_response.py
@@ -4,7 +4,7 @@
from datetime import datetime
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
from .dcv_method import DCVMethod
from .bundle_method import BundleMethod
from .domain_validation_type import DomainValidationType
diff --git a/src/cloudflare/types/custom_hostname_list_params.py b/src/cloudflare/types/custom_hostnames/custom_hostname_list_params.py
similarity index 100%
rename from src/cloudflare/types/custom_hostname_list_params.py
rename to src/cloudflare/types/custom_hostnames/custom_hostname_list_params.py
diff --git a/src/cloudflare/types/custom_hostname_list_response.py b/src/cloudflare/types/custom_hostnames/custom_hostname_list_response.py
similarity index 99%
rename from src/cloudflare/types/custom_hostname_list_response.py
rename to src/cloudflare/types/custom_hostnames/custom_hostname_list_response.py
index dbfdc887b48..de8909d348a 100644
--- a/src/cloudflare/types/custom_hostname_list_response.py
+++ b/src/cloudflare/types/custom_hostnames/custom_hostname_list_response.py
@@ -4,7 +4,7 @@
from datetime import datetime
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
from .dcv_method import DCVMethod
from .bundle_method import BundleMethod
from .domain_validation_type import DomainValidationType
diff --git a/src/cloudflare/types/dcv_method.py b/src/cloudflare/types/custom_hostnames/dcv_method.py
similarity index 100%
rename from src/cloudflare/types/dcv_method.py
rename to src/cloudflare/types/custom_hostnames/dcv_method.py
diff --git a/src/cloudflare/types/domain_validation_type.py b/src/cloudflare/types/custom_hostnames/domain_validation_type.py
similarity index 100%
rename from src/cloudflare/types/domain_validation_type.py
rename to src/cloudflare/types/custom_hostnames/domain_validation_type.py
diff --git a/src/cloudflare/types/custom_nameservers/__init__.py b/src/cloudflare/types/custom_nameservers/__init__.py
new file mode 100644
index 00000000000..50319977db9
--- /dev/null
+++ b/src/cloudflare/types/custom_nameservers/__init__.py
@@ -0,0 +1,14 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .custom_nameserver import CustomNameserver as CustomNameserver
+from .custom_nameserver_get_response import CustomNameserverGetResponse as CustomNameserverGetResponse
+from .custom_nameserver_create_params import CustomNameserverCreateParams as CustomNameserverCreateParams
+from .custom_nameserver_delete_params import CustomNameserverDeleteParams as CustomNameserverDeleteParams
+from .custom_nameserver_verify_params import CustomNameserverVerifyParams as CustomNameserverVerifyParams
+from .custom_nameserver_delete_response import CustomNameserverDeleteResponse as CustomNameserverDeleteResponse
+from .custom_nameserver_verify_response import CustomNameserverVerifyResponse as CustomNameserverVerifyResponse
+from .custom_nameserver_availabilty_response import (
+ CustomNameserverAvailabiltyResponse as CustomNameserverAvailabiltyResponse,
+)
diff --git a/src/cloudflare/types/custom_nameserver.py b/src/cloudflare/types/custom_nameservers/custom_nameserver.py
similarity index 96%
rename from src/cloudflare/types/custom_nameserver.py
rename to src/cloudflare/types/custom_nameservers/custom_nameserver.py
index 9f2a309d04d..9b56d6d5495 100644
--- a/src/cloudflare/types/custom_nameserver.py
+++ b/src/cloudflare/types/custom_nameservers/custom_nameserver.py
@@ -3,7 +3,7 @@
from typing import List, Optional
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["CustomNameserver", "DNSRecord"]
diff --git a/src/cloudflare/types/custom_nameserver_availabilty_response.py b/src/cloudflare/types/custom_nameservers/custom_nameserver_availabilty_response.py
similarity index 100%
rename from src/cloudflare/types/custom_nameserver_availabilty_response.py
rename to src/cloudflare/types/custom_nameservers/custom_nameserver_availabilty_response.py
diff --git a/src/cloudflare/types/custom_nameserver_create_params.py b/src/cloudflare/types/custom_nameservers/custom_nameserver_create_params.py
similarity index 100%
rename from src/cloudflare/types/custom_nameserver_create_params.py
rename to src/cloudflare/types/custom_nameservers/custom_nameserver_create_params.py
diff --git a/src/cloudflare/types/custom_nameserver_delete_params.py b/src/cloudflare/types/custom_nameservers/custom_nameserver_delete_params.py
similarity index 100%
rename from src/cloudflare/types/custom_nameserver_delete_params.py
rename to src/cloudflare/types/custom_nameservers/custom_nameserver_delete_params.py
diff --git a/src/cloudflare/types/custom_nameserver_delete_response.py b/src/cloudflare/types/custom_nameservers/custom_nameserver_delete_response.py
similarity index 100%
rename from src/cloudflare/types/custom_nameserver_delete_response.py
rename to src/cloudflare/types/custom_nameservers/custom_nameserver_delete_response.py
diff --git a/src/cloudflare/types/custom_nameserver_get_response.py b/src/cloudflare/types/custom_nameservers/custom_nameserver_get_response.py
similarity index 100%
rename from src/cloudflare/types/custom_nameserver_get_response.py
rename to src/cloudflare/types/custom_nameservers/custom_nameserver_get_response.py
diff --git a/src/cloudflare/types/custom_nameserver_verify_params.py b/src/cloudflare/types/custom_nameservers/custom_nameserver_verify_params.py
similarity index 100%
rename from src/cloudflare/types/custom_nameserver_verify_params.py
rename to src/cloudflare/types/custom_nameservers/custom_nameserver_verify_params.py
diff --git a/src/cloudflare/types/custom_nameserver_verify_response.py b/src/cloudflare/types/custom_nameservers/custom_nameserver_verify_response.py
similarity index 100%
rename from src/cloudflare/types/custom_nameserver_verify_response.py
rename to src/cloudflare/types/custom_nameservers/custom_nameserver_verify_response.py
diff --git a/src/cloudflare/types/dns/__init__.py b/src/cloudflare/types/dns/__init__.py
index ab67cfd2979..8f291b22a54 100644
--- a/src/cloudflare/types/dns/__init__.py
+++ b/src/cloudflare/types/dns/__init__.py
@@ -36,6 +36,7 @@
from .record_list_params import RecordListParams as RecordListParams
from .record_scan_params import RecordScanParams as RecordScanParams
from .upstream_ips_param import UpstreamIPsParam as UpstreamIPsParam
+from .dns_analytics_query import DNSAnalyticsQuery as DNSAnalyticsQuery
from .firewall_edit_params import FirewallEditParams as FirewallEditParams
from .firewall_list_params import FirewallListParams as FirewallListParams
from .record_create_params import RecordCreateParams as RecordCreateParams
@@ -51,3 +52,4 @@
from .record_import_response import RecordImportResponse as RecordImportResponse
from .attack_mitigation_param import AttackMitigationParam as AttackMitigationParam
from .firewall_delete_response import FirewallDeleteResponse as FirewallDeleteResponse
+from .dns_analytics_nominal_metric import DNSAnalyticsNominalMetric as DNSAnalyticsNominalMetric
diff --git a/src/cloudflare/types/dns/analytics/reports/by_time.py b/src/cloudflare/types/dns/analytics/reports/by_time.py
index 5ce605506b8..54d6c796c02 100644
--- a/src/cloudflare/types/dns/analytics/reports/by_time.py
+++ b/src/cloudflare/types/dns/analytics/reports/by_time.py
@@ -4,8 +4,8 @@
from datetime import datetime
from ....._models import BaseModel
-from ....dns_analytics_query import DNSAnalyticsQuery
-from ....dns_analytics_nominal_metric import DNSAnalyticsNominalMetric
+from ...dns_analytics_query import DNSAnalyticsQuery
+from ...dns_analytics_nominal_metric import DNSAnalyticsNominalMetric
__all__ = ["ByTime", "Data"]
diff --git a/src/cloudflare/types/dns_analytics_nominal_metric.py b/src/cloudflare/types/dns/dns_analytics_nominal_metric.py
similarity index 100%
rename from src/cloudflare/types/dns_analytics_nominal_metric.py
rename to src/cloudflare/types/dns/dns_analytics_nominal_metric.py
diff --git a/src/cloudflare/types/dns_analytics_query.py b/src/cloudflare/types/dns/dns_analytics_query.py
similarity index 96%
rename from src/cloudflare/types/dns_analytics_query.py
rename to src/cloudflare/types/dns/dns_analytics_query.py
index d287e82cf77..b1d886168e6 100644
--- a/src/cloudflare/types/dns_analytics_query.py
+++ b/src/cloudflare/types/dns/dns_analytics_query.py
@@ -4,7 +4,7 @@
from datetime import datetime
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["DNSAnalyticsQuery"]
diff --git a/src/cloudflare/types/dnssec/__init__.py b/src/cloudflare/types/dnssec/__init__.py
new file mode 100644
index 00000000000..ee2cb757f84
--- /dev/null
+++ b/src/cloudflare/types/dnssec/__init__.py
@@ -0,0 +1,8 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .dnssec import DNSSEC as DNSSEC
+from .dnssec_edit_params import DNSSECEditParams as DNSSECEditParams
+from .dnssec_delete_params import DNSSECDeleteParams as DNSSECDeleteParams
+from .dnssec_delete_response import DNSSECDeleteResponse as DNSSECDeleteResponse
diff --git a/src/cloudflare/types/dnssec.py b/src/cloudflare/types/dnssec/dnssec.py
similarity index 98%
rename from src/cloudflare/types/dnssec.py
rename to src/cloudflare/types/dnssec/dnssec.py
index ae9788e6527..0b18c1f6d2d 100644
--- a/src/cloudflare/types/dnssec.py
+++ b/src/cloudflare/types/dnssec/dnssec.py
@@ -4,7 +4,7 @@
from datetime import datetime
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["DNSSEC"]
diff --git a/src/cloudflare/types/dnssec_delete_params.py b/src/cloudflare/types/dnssec/dnssec_delete_params.py
similarity index 100%
rename from src/cloudflare/types/dnssec_delete_params.py
rename to src/cloudflare/types/dnssec/dnssec_delete_params.py
diff --git a/src/cloudflare/types/dnssec_delete_response.py b/src/cloudflare/types/dnssec/dnssec_delete_response.py
similarity index 100%
rename from src/cloudflare/types/dnssec_delete_response.py
rename to src/cloudflare/types/dnssec/dnssec_delete_response.py
diff --git a/src/cloudflare/types/dnssec_edit_params.py b/src/cloudflare/types/dnssec/dnssec_edit_params.py
similarity index 100%
rename from src/cloudflare/types/dnssec_edit_params.py
rename to src/cloudflare/types/dnssec/dnssec_edit_params.py
diff --git a/src/cloudflare/types/email_routing/__init__.py b/src/cloudflare/types/email_routing/__init__.py
index 4fcda1b273a..8d2246d0cf8 100644
--- a/src/cloudflare/types/email_routing/__init__.py
+++ b/src/cloudflare/types/email_routing/__init__.py
@@ -5,6 +5,7 @@
from .action import Action as Action
from .address import Address as Address
from .matcher import Matcher as Matcher
+from .settings import Settings as Settings
from .dns_record import DNSRecord as DNSRecord
from .action_param import ActionParam as ActionParam
from .matcher_param import MatcherParam as MatcherParam
@@ -15,3 +16,5 @@
from .rule_update_params import RuleUpdateParams as RuleUpdateParams
from .address_list_params import AddressListParams as AddressListParams
from .address_create_params import AddressCreateParams as AddressCreateParams
+from .email_routing_enable_params import EmailRoutingEnableParams as EmailRoutingEnableParams
+from .email_routing_disable_params import EmailRoutingDisableParams as EmailRoutingDisableParams
diff --git a/src/cloudflare/types/email_routing_disable_params.py b/src/cloudflare/types/email_routing/email_routing_disable_params.py
similarity index 100%
rename from src/cloudflare/types/email_routing_disable_params.py
rename to src/cloudflare/types/email_routing/email_routing_disable_params.py
diff --git a/src/cloudflare/types/email_routing_enable_params.py b/src/cloudflare/types/email_routing/email_routing_enable_params.py
similarity index 100%
rename from src/cloudflare/types/email_routing_enable_params.py
rename to src/cloudflare/types/email_routing/email_routing_enable_params.py
diff --git a/src/cloudflare/types/settings.py b/src/cloudflare/types/email_routing/settings.py
similarity index 97%
rename from src/cloudflare/types/settings.py
rename to src/cloudflare/types/email_routing/settings.py
index c9aecbe081b..7db6e4a5f0b 100644
--- a/src/cloudflare/types/settings.py
+++ b/src/cloudflare/types/email_routing/settings.py
@@ -4,7 +4,7 @@
from datetime import datetime
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["Settings"]
diff --git a/src/cloudflare/types/filters/__init__.py b/src/cloudflare/types/filters/__init__.py
new file mode 100644
index 00000000000..0be276f7d5c
--- /dev/null
+++ b/src/cloudflare/types/filters/__init__.py
@@ -0,0 +1,10 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .firewall_filter import FirewallFilter as FirewallFilter
+from .filter_list_params import FilterListParams as FilterListParams
+from .filter_create_params import FilterCreateParams as FilterCreateParams
+from .filter_delete_params import FilterDeleteParams as FilterDeleteParams
+from .filter_update_params import FilterUpdateParams as FilterUpdateParams
+from .filter_create_response import FilterCreateResponse as FilterCreateResponse
diff --git a/src/cloudflare/types/filter_create_params.py b/src/cloudflare/types/filters/filter_create_params.py
similarity index 100%
rename from src/cloudflare/types/filter_create_params.py
rename to src/cloudflare/types/filters/filter_create_params.py
diff --git a/src/cloudflare/types/filter_create_response.py b/src/cloudflare/types/filters/filter_create_response.py
similarity index 100%
rename from src/cloudflare/types/filter_create_response.py
rename to src/cloudflare/types/filters/filter_create_response.py
diff --git a/src/cloudflare/types/filter_delete_params.py b/src/cloudflare/types/filters/filter_delete_params.py
similarity index 100%
rename from src/cloudflare/types/filter_delete_params.py
rename to src/cloudflare/types/filters/filter_delete_params.py
diff --git a/src/cloudflare/types/filter_list_params.py b/src/cloudflare/types/filters/filter_list_params.py
similarity index 100%
rename from src/cloudflare/types/filter_list_params.py
rename to src/cloudflare/types/filters/filter_list_params.py
diff --git a/src/cloudflare/types/filter_update_params.py b/src/cloudflare/types/filters/filter_update_params.py
similarity index 100%
rename from src/cloudflare/types/filter_update_params.py
rename to src/cloudflare/types/filters/filter_update_params.py
diff --git a/src/cloudflare/types/firewall_filter.py b/src/cloudflare/types/filters/firewall_filter.py
similarity index 95%
rename from src/cloudflare/types/firewall_filter.py
rename to src/cloudflare/types/filters/firewall_filter.py
index 5114c5f9346..03fdc13a222 100644
--- a/src/cloudflare/types/firewall_filter.py
+++ b/src/cloudflare/types/filters/firewall_filter.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["FirewallFilter"]
diff --git a/src/cloudflare/types/firewall/firewall_rule.py b/src/cloudflare/types/firewall/firewall_rule.py
index 1c963dbebd5..6e5b521c5d2 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 ..action import Action
+from ..filters import FirewallFilter
from .products import Products
from ..._models import BaseModel
+from ..rate_limits import Action
from .deleted_filter import DeletedFilter
-from ..firewall_filter import FirewallFilter
__all__ = ["FirewallRule", "Filter"]
diff --git a/src/cloudflare/types/healthchecks/__init__.py b/src/cloudflare/types/healthchecks/__init__.py
index 8ab6024e209..e815a8bb9f7 100644
--- a/src/cloudflare/types/healthchecks/__init__.py
+++ b/src/cloudflare/types/healthchecks/__init__.py
@@ -2,6 +2,17 @@
from __future__ import annotations
+from .healthcheck import Healthcheck as Healthcheck
+from .check_region import CheckRegion as CheckRegion
+from .tcp_configuration import TCPConfiguration as TCPConfiguration
+from .http_configuration import HTTPConfiguration as HTTPConfiguration
from .preview_create_params import PreviewCreateParams as PreviewCreateParams
from .preview_delete_params import PreviewDeleteParams as PreviewDeleteParams
+from .healthcheck_edit_params import HealthcheckEditParams as HealthcheckEditParams
from .preview_delete_response import PreviewDeleteResponse as PreviewDeleteResponse
+from .tcp_configuration_param import TCPConfigurationParam as TCPConfigurationParam
+from .http_configuration_param import HTTPConfigurationParam as HTTPConfigurationParam
+from .healthcheck_create_params import HealthcheckCreateParams as HealthcheckCreateParams
+from .healthcheck_delete_params import HealthcheckDeleteParams as HealthcheckDeleteParams
+from .healthcheck_update_params import HealthcheckUpdateParams as HealthcheckUpdateParams
+from .healthcheck_delete_response import HealthcheckDeleteResponse as HealthcheckDeleteResponse
diff --git a/src/cloudflare/types/healthchecks/check_region.py b/src/cloudflare/types/healthchecks/check_region.py
new file mode 100644
index 00000000000..46b58dd4b75
--- /dev/null
+++ b/src/cloudflare/types/healthchecks/check_region.py
@@ -0,0 +1,9 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing_extensions import Literal
+
+__all__ = ["CheckRegion"]
+
+CheckRegion = Literal[
+ "WNAM", "ENAM", "WEU", "EEU", "NSAM", "SSAM", "OC", "ME", "NAF", "SAF", "IN", "SEAS", "NEAS", "ALL_REGIONS"
+]
diff --git a/src/cloudflare/types/healthcheck.py b/src/cloudflare/types/healthchecks/healthcheck.py
similarity index 98%
rename from src/cloudflare/types/healthcheck.py
rename to src/cloudflare/types/healthchecks/healthcheck.py
index 671d71fc0a6..07d6bb0c505 100644
--- a/src/cloudflare/types/healthcheck.py
+++ b/src/cloudflare/types/healthchecks/healthcheck.py
@@ -4,7 +4,7 @@
from datetime import datetime
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
from .check_region import CheckRegion
from .tcp_configuration import TCPConfiguration
from .http_configuration import HTTPConfiguration
diff --git a/src/cloudflare/types/healthcheck_create_params.py b/src/cloudflare/types/healthchecks/healthcheck_create_params.py
similarity index 98%
rename from src/cloudflare/types/healthcheck_create_params.py
rename to src/cloudflare/types/healthchecks/healthcheck_create_params.py
index 9fcf2a0f5ce..90a2b01f73f 100644
--- a/src/cloudflare/types/healthcheck_create_params.py
+++ b/src/cloudflare/types/healthchecks/healthcheck_create_params.py
@@ -5,7 +5,7 @@
from typing import List, Optional
from typing_extensions import Required, Annotated, TypedDict
-from .._utils import PropertyInfo
+from ..._utils import PropertyInfo
from .check_region import CheckRegion
from .tcp_configuration_param import TCPConfigurationParam
from .http_configuration_param import HTTPConfigurationParam
diff --git a/src/cloudflare/types/healthcheck_delete_params.py b/src/cloudflare/types/healthchecks/healthcheck_delete_params.py
similarity index 100%
rename from src/cloudflare/types/healthcheck_delete_params.py
rename to src/cloudflare/types/healthchecks/healthcheck_delete_params.py
diff --git a/src/cloudflare/types/healthcheck_delete_response.py b/src/cloudflare/types/healthchecks/healthcheck_delete_response.py
similarity index 88%
rename from src/cloudflare/types/healthcheck_delete_response.py
rename to src/cloudflare/types/healthchecks/healthcheck_delete_response.py
index 6bbe40c8819..adcd26dd9dc 100644
--- a/src/cloudflare/types/healthcheck_delete_response.py
+++ b/src/cloudflare/types/healthchecks/healthcheck_delete_response.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["HealthcheckDeleteResponse"]
diff --git a/src/cloudflare/types/healthcheck_edit_params.py b/src/cloudflare/types/healthchecks/healthcheck_edit_params.py
similarity index 98%
rename from src/cloudflare/types/healthcheck_edit_params.py
rename to src/cloudflare/types/healthchecks/healthcheck_edit_params.py
index 8656849de64..605ca984c32 100644
--- a/src/cloudflare/types/healthcheck_edit_params.py
+++ b/src/cloudflare/types/healthchecks/healthcheck_edit_params.py
@@ -5,7 +5,7 @@
from typing import List, Optional
from typing_extensions import Required, Annotated, TypedDict
-from .._utils import PropertyInfo
+from ..._utils import PropertyInfo
from .check_region import CheckRegion
from .tcp_configuration_param import TCPConfigurationParam
from .http_configuration_param import HTTPConfigurationParam
diff --git a/src/cloudflare/types/healthcheck_update_params.py b/src/cloudflare/types/healthchecks/healthcheck_update_params.py
similarity index 98%
rename from src/cloudflare/types/healthcheck_update_params.py
rename to src/cloudflare/types/healthchecks/healthcheck_update_params.py
index 271a9f66ca7..834571fde52 100644
--- a/src/cloudflare/types/healthcheck_update_params.py
+++ b/src/cloudflare/types/healthchecks/healthcheck_update_params.py
@@ -5,7 +5,7 @@
from typing import List, Optional
from typing_extensions import Required, Annotated, TypedDict
-from .._utils import PropertyInfo
+from ..._utils import PropertyInfo
from .check_region import CheckRegion
from .tcp_configuration_param import TCPConfigurationParam
from .http_configuration_param import HTTPConfigurationParam
diff --git a/src/cloudflare/types/http_configuration.py b/src/cloudflare/types/healthchecks/http_configuration.py
similarity index 97%
rename from src/cloudflare/types/http_configuration.py
rename to src/cloudflare/types/healthchecks/http_configuration.py
index 1065c80783a..e7816f99ec0 100644
--- a/src/cloudflare/types/http_configuration.py
+++ b/src/cloudflare/types/healthchecks/http_configuration.py
@@ -3,7 +3,7 @@
from typing import List, Optional
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["HTTPConfiguration"]
diff --git a/src/cloudflare/types/http_configuration_param.py b/src/cloudflare/types/healthchecks/http_configuration_param.py
similarity index 100%
rename from src/cloudflare/types/http_configuration_param.py
rename to src/cloudflare/types/healthchecks/http_configuration_param.py
diff --git a/src/cloudflare/types/healthchecks/preview_create_params.py b/src/cloudflare/types/healthchecks/preview_create_params.py
index e9ad814ec7d..8020a44e035 100644
--- a/src/cloudflare/types/healthchecks/preview_create_params.py
+++ b/src/cloudflare/types/healthchecks/preview_create_params.py
@@ -6,9 +6,9 @@
from typing_extensions import Required, Annotated, TypedDict
from ..._utils import PropertyInfo
-from ..check_region import CheckRegion
-from ..tcp_configuration_param import TCPConfigurationParam
-from ..http_configuration_param import HTTPConfigurationParam
+from .check_region import CheckRegion
+from .tcp_configuration_param import TCPConfigurationParam
+from .http_configuration_param import HTTPConfigurationParam
__all__ = ["PreviewCreateParams"]
diff --git a/src/cloudflare/types/tcp_configuration.py b/src/cloudflare/types/healthchecks/tcp_configuration.py
similarity index 93%
rename from src/cloudflare/types/tcp_configuration.py
rename to src/cloudflare/types/healthchecks/tcp_configuration.py
index 7424759e961..f654cccf8f9 100644
--- a/src/cloudflare/types/tcp_configuration.py
+++ b/src/cloudflare/types/healthchecks/tcp_configuration.py
@@ -3,7 +3,7 @@
from typing import Optional
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["TCPConfiguration"]
diff --git a/src/cloudflare/types/tcp_configuration_param.py b/src/cloudflare/types/healthchecks/tcp_configuration_param.py
similarity index 100%
rename from src/cloudflare/types/tcp_configuration_param.py
rename to src/cloudflare/types/healthchecks/tcp_configuration_param.py
diff --git a/src/cloudflare/types/hyperdrive/__init__.py b/src/cloudflare/types/hyperdrive/__init__.py
index 2f425ad383c..db97c2c8547 100644
--- a/src/cloudflare/types/hyperdrive/__init__.py
+++ b/src/cloudflare/types/hyperdrive/__init__.py
@@ -3,7 +3,9 @@
from __future__ import annotations
from .hyperdrive import Hyperdrive as Hyperdrive
+from .configuration import Configuration as Configuration
from .config_edit_params import ConfigEditParams as ConfigEditParams
+from .configuration_param import ConfigurationParam as ConfigurationParam
from .config_create_params import ConfigCreateParams as ConfigCreateParams
from .config_update_params import ConfigUpdateParams as ConfigUpdateParams
from .config_delete_response import ConfigDeleteResponse as ConfigDeleteResponse
diff --git a/src/cloudflare/types/hyperdrive/config_create_params.py b/src/cloudflare/types/hyperdrive/config_create_params.py
index a9468fc4ba2..f75ec02aafd 100644
--- a/src/cloudflare/types/hyperdrive/config_create_params.py
+++ b/src/cloudflare/types/hyperdrive/config_create_params.py
@@ -4,7 +4,7 @@
from typing_extensions import Required, TypedDict
-from ..configuration_param import ConfigurationParam
+from .configuration_param import ConfigurationParam
__all__ = ["ConfigCreateParams", "Caching"]
diff --git a/src/cloudflare/types/hyperdrive/config_edit_params.py b/src/cloudflare/types/hyperdrive/config_edit_params.py
index 3769cf1b752..6e63828615c 100644
--- a/src/cloudflare/types/hyperdrive/config_edit_params.py
+++ b/src/cloudflare/types/hyperdrive/config_edit_params.py
@@ -4,7 +4,7 @@
from typing_extensions import Required, TypedDict
-from ..configuration_param import ConfigurationParam
+from .configuration_param import ConfigurationParam
__all__ = ["ConfigEditParams", "Caching"]
diff --git a/src/cloudflare/types/hyperdrive/config_update_params.py b/src/cloudflare/types/hyperdrive/config_update_params.py
index f4c2909a50b..451436b383d 100644
--- a/src/cloudflare/types/hyperdrive/config_update_params.py
+++ b/src/cloudflare/types/hyperdrive/config_update_params.py
@@ -4,7 +4,7 @@
from typing_extensions import Required, TypedDict
-from ..configuration_param import ConfigurationParam
+from .configuration_param import ConfigurationParam
__all__ = ["ConfigUpdateParams", "Caching"]
diff --git a/src/cloudflare/types/configuration.py b/src/cloudflare/types/hyperdrive/configuration.py
similarity index 94%
rename from src/cloudflare/types/configuration.py
rename to src/cloudflare/types/hyperdrive/configuration.py
index 7495c84594f..68c745a34de 100644
--- a/src/cloudflare/types/configuration.py
+++ b/src/cloudflare/types/hyperdrive/configuration.py
@@ -2,7 +2,7 @@
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["Configuration"]
diff --git a/src/cloudflare/types/configuration_param.py b/src/cloudflare/types/hyperdrive/configuration_param.py
similarity index 100%
rename from src/cloudflare/types/configuration_param.py
rename to src/cloudflare/types/hyperdrive/configuration_param.py
diff --git a/src/cloudflare/types/hyperdrive/hyperdrive.py b/src/cloudflare/types/hyperdrive/hyperdrive.py
index 242e98b9e78..70822832c29 100644
--- a/src/cloudflare/types/hyperdrive/hyperdrive.py
+++ b/src/cloudflare/types/hyperdrive/hyperdrive.py
@@ -3,7 +3,7 @@
from typing import Optional
from ..._models import BaseModel
-from ..configuration import Configuration
+from .configuration import Configuration
__all__ = ["Hyperdrive", "Caching"]
diff --git a/src/cloudflare/types/ips/__init__.py b/src/cloudflare/types/ips/__init__.py
new file mode 100644
index 00000000000..4b563930dab
--- /dev/null
+++ b/src/cloudflare/types/ips/__init__.py
@@ -0,0 +1,8 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .ips import IPs as IPs
+from .jdcloud_ips import JDCloudIPs as JDCloudIPs
+from .ip_list_params import IPListParams as IPListParams
+from .ip_list_response import IPListResponse as IPListResponse
diff --git a/src/cloudflare/types/ip_list_params.py b/src/cloudflare/types/ips/ip_list_params.py
similarity index 100%
rename from src/cloudflare/types/ip_list_params.py
rename to src/cloudflare/types/ips/ip_list_params.py
diff --git a/src/cloudflare/types/ip_list_response.py b/src/cloudflare/types/ips/ip_list_response.py
similarity index 100%
rename from src/cloudflare/types/ip_list_response.py
rename to src/cloudflare/types/ips/ip_list_response.py
diff --git a/src/cloudflare/types/ips.py b/src/cloudflare/types/ips/ips.py
similarity index 93%
rename from src/cloudflare/types/ips.py
rename to src/cloudflare/types/ips/ips.py
index a7a326e6179..176e4c0db8a 100644
--- a/src/cloudflare/types/ips.py
+++ b/src/cloudflare/types/ips/ips.py
@@ -2,7 +2,7 @@
from typing import List, Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["IPs"]
diff --git a/src/cloudflare/types/jdcloud_ips.py b/src/cloudflare/types/ips/jdcloud_ips.py
similarity index 94%
rename from src/cloudflare/types/jdcloud_ips.py
rename to src/cloudflare/types/ips/jdcloud_ips.py
index 5d9c8d80dd8..d09b6d10a60 100644
--- a/src/cloudflare/types/jdcloud_ips.py
+++ b/src/cloudflare/types/ips/jdcloud_ips.py
@@ -2,7 +2,7 @@
from typing import List, Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["JDCloudIPs"]
diff --git a/src/cloudflare/types/keyless_certificates/__init__.py b/src/cloudflare/types/keyless_certificates/__init__.py
new file mode 100644
index 00000000000..426c1485f9b
--- /dev/null
+++ b/src/cloudflare/types/keyless_certificates/__init__.py
@@ -0,0 +1,11 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .tunnel import Tunnel as Tunnel
+from .tunnel_param import TunnelParam as TunnelParam
+from .keyless_certificate import KeylessCertificate as KeylessCertificate
+from .keyless_certificate_edit_params import KeylessCertificateEditParams as KeylessCertificateEditParams
+from .keyless_certificate_create_params import KeylessCertificateCreateParams as KeylessCertificateCreateParams
+from .keyless_certificate_delete_params import KeylessCertificateDeleteParams as KeylessCertificateDeleteParams
+from .keyless_certificate_delete_response import KeylessCertificateDeleteResponse as KeylessCertificateDeleteResponse
diff --git a/src/cloudflare/types/keyless_certificate.py b/src/cloudflare/types/keyless_certificates/keyless_certificate.py
similarity index 97%
rename from src/cloudflare/types/keyless_certificate.py
rename to src/cloudflare/types/keyless_certificates/keyless_certificate.py
index 4f29750056d..12075f47715 100644
--- a/src/cloudflare/types/keyless_certificate.py
+++ b/src/cloudflare/types/keyless_certificates/keyless_certificate.py
@@ -5,7 +5,7 @@
from typing_extensions import Literal
from .tunnel import Tunnel
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["KeylessCertificate"]
diff --git a/src/cloudflare/types/keyless_certificate_create_params.py b/src/cloudflare/types/keyless_certificates/keyless_certificate_create_params.py
similarity index 96%
rename from src/cloudflare/types/keyless_certificate_create_params.py
rename to src/cloudflare/types/keyless_certificates/keyless_certificate_create_params.py
index 0d3c9922376..86164d00907 100644
--- a/src/cloudflare/types/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 .bundle_method import BundleMethod
+from ..custom_hostnames import BundleMethod
__all__ = ["KeylessCertificateCreateParams"]
diff --git a/src/cloudflare/types/keyless_certificate_delete_params.py b/src/cloudflare/types/keyless_certificates/keyless_certificate_delete_params.py
similarity index 100%
rename from src/cloudflare/types/keyless_certificate_delete_params.py
rename to src/cloudflare/types/keyless_certificates/keyless_certificate_delete_params.py
diff --git a/src/cloudflare/types/keyless_certificate_delete_response.py b/src/cloudflare/types/keyless_certificates/keyless_certificate_delete_response.py
similarity index 89%
rename from src/cloudflare/types/keyless_certificate_delete_response.py
rename to src/cloudflare/types/keyless_certificates/keyless_certificate_delete_response.py
index f21484a947b..9544ffc0d28 100644
--- a/src/cloudflare/types/keyless_certificate_delete_response.py
+++ b/src/cloudflare/types/keyless_certificates/keyless_certificate_delete_response.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["KeylessCertificateDeleteResponse"]
diff --git a/src/cloudflare/types/keyless_certificate_edit_params.py b/src/cloudflare/types/keyless_certificates/keyless_certificate_edit_params.py
similarity index 100%
rename from src/cloudflare/types/keyless_certificate_edit_params.py
rename to src/cloudflare/types/keyless_certificates/keyless_certificate_edit_params.py
diff --git a/src/cloudflare/types/tunnel.py b/src/cloudflare/types/keyless_certificates/tunnel.py
similarity index 88%
rename from src/cloudflare/types/tunnel.py
rename to src/cloudflare/types/keyless_certificates/tunnel.py
index d0437432315..825ea03f94e 100644
--- a/src/cloudflare/types/tunnel.py
+++ b/src/cloudflare/types/keyless_certificates/tunnel.py
@@ -1,6 +1,6 @@
# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["Tunnel"]
diff --git a/src/cloudflare/types/tunnel_param.py b/src/cloudflare/types/keyless_certificates/tunnel_param.py
similarity index 100%
rename from src/cloudflare/types/tunnel_param.py
rename to src/cloudflare/types/keyless_certificates/tunnel_param.py
diff --git a/src/cloudflare/types/load_balancers/__init__.py b/src/cloudflare/types/load_balancers/__init__.py
index 12a6bb95396..22ae0e993e9 100644
--- a/src/cloudflare/types/load_balancers/__init__.py
+++ b/src/cloudflare/types/load_balancers/__init__.py
@@ -2,22 +2,53 @@
from __future__ import annotations
+from .host import Host as Host
from .pool import Pool as Pool
+from .rules import Rules as Rules
+from .header import Header as Header
+from .origin import Origin as Origin
from .monitor import Monitor as Monitor
+from .rules_param import RulesParam as RulesParam
+from .check_region import CheckRegion as CheckRegion
+from .header_param import HeaderParam as HeaderParam
+from .origin_param import OriginParam as OriginParam
+from .default_pools import DefaultPools as DefaultPools
+from .load_balancer import LoadBalancer as LoadBalancer
+from .load_shedding import LoadShedding as LoadShedding
+from .filter_options import FilterOptions as FilterOptions
+from .origin_steering import OriginSteering as OriginSteering
+from .random_steering import RandomSteering as RandomSteering
+from .adaptive_routing import AdaptiveRouting as AdaptiveRouting
from .pool_edit_params import PoolEditParams as PoolEditParams
from .pool_list_params import PoolListParams as PoolListParams
+from .location_strategy import LocationStrategy as LocationStrategy
from .search_get_params import SearchGetParams as SearchGetParams
from .pool_create_params import PoolCreateParams as PoolCreateParams
from .pool_delete_params import PoolDeleteParams as PoolDeleteParams
from .pool_update_params import PoolUpdateParams as PoolUpdateParams
from .region_list_params import RegionListParams as RegionListParams
+from .load_shedding_param import LoadSheddingParam as LoadSheddingParam
from .monitor_edit_params import MonitorEditParams as MonitorEditParams
+from .notification_filter import NotificationFilter as NotificationFilter
from .region_get_response import RegionGetResponse as RegionGetResponse
from .search_get_response import SearchGetResponse as SearchGetResponse
+from .filter_options_param import FilterOptionsParam as FilterOptionsParam
from .pool_delete_response import PoolDeleteResponse as PoolDeleteResponse
from .preview_get_response import PreviewGetResponse as PreviewGetResponse
from .region_list_response import RegionListResponse as RegionListResponse
from .monitor_create_params import MonitorCreateParams as MonitorCreateParams
from .monitor_delete_params import MonitorDeleteParams as MonitorDeleteParams
from .monitor_update_params import MonitorUpdateParams as MonitorUpdateParams
+from .origin_steering_param import OriginSteeringParam as OriginSteeringParam
+from .random_steering_param import RandomSteeringParam as RandomSteeringParam
+from .adaptive_routing_param import AdaptiveRoutingParam as AdaptiveRoutingParam
+from .location_strategy_param import LocationStrategyParam as LocationStrategyParam
from .monitor_delete_response import MonitorDeleteResponse as MonitorDeleteResponse
+from .load_balancer_edit_params import LoadBalancerEditParams as LoadBalancerEditParams
+from .notification_filter_param import NotificationFilterParam as NotificationFilterParam
+from .load_balancer_create_params import LoadBalancerCreateParams as LoadBalancerCreateParams
+from .load_balancer_delete_params import LoadBalancerDeleteParams as LoadBalancerDeleteParams
+from .load_balancer_update_params import LoadBalancerUpdateParams as LoadBalancerUpdateParams
+from .session_affinity_attributes import SessionAffinityAttributes as SessionAffinityAttributes
+from .load_balancer_delete_response import LoadBalancerDeleteResponse as LoadBalancerDeleteResponse
+from .session_affinity_attributes_param import SessionAffinityAttributesParam as SessionAffinityAttributesParam
diff --git a/src/cloudflare/types/adaptive_routing.py b/src/cloudflare/types/load_balancers/adaptive_routing.py
similarity index 95%
rename from src/cloudflare/types/adaptive_routing.py
rename to src/cloudflare/types/load_balancers/adaptive_routing.py
index d31e170e203..b4d03c48652 100644
--- a/src/cloudflare/types/adaptive_routing.py
+++ b/src/cloudflare/types/load_balancers/adaptive_routing.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["AdaptiveRouting"]
diff --git a/src/cloudflare/types/adaptive_routing_param.py b/src/cloudflare/types/load_balancers/adaptive_routing_param.py
similarity index 100%
rename from src/cloudflare/types/adaptive_routing_param.py
rename to src/cloudflare/types/load_balancers/adaptive_routing_param.py
diff --git a/src/cloudflare/types/check_region.py b/src/cloudflare/types/load_balancers/check_region.py
similarity index 100%
rename from src/cloudflare/types/check_region.py
rename to src/cloudflare/types/load_balancers/check_region.py
diff --git a/src/cloudflare/types/default_pools.py b/src/cloudflare/types/load_balancers/default_pools.py
similarity index 100%
rename from src/cloudflare/types/default_pools.py
rename to src/cloudflare/types/load_balancers/default_pools.py
diff --git a/src/cloudflare/types/filter_options.py b/src/cloudflare/types/load_balancers/filter_options.py
similarity index 93%
rename from src/cloudflare/types/filter_options.py
rename to src/cloudflare/types/load_balancers/filter_options.py
index 3f2573708ba..a1b4b46c17d 100644
--- a/src/cloudflare/types/filter_options.py
+++ b/src/cloudflare/types/load_balancers/filter_options.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["FilterOptions"]
diff --git a/src/cloudflare/types/filter_options_param.py b/src/cloudflare/types/load_balancers/filter_options_param.py
similarity index 100%
rename from src/cloudflare/types/filter_options_param.py
rename to src/cloudflare/types/load_balancers/filter_options_param.py
diff --git a/src/cloudflare/types/header.py b/src/cloudflare/types/load_balancers/header.py
similarity index 93%
rename from src/cloudflare/types/header.py
rename to src/cloudflare/types/load_balancers/header.py
index 215fc4846cb..b6bd2830a64 100644
--- a/src/cloudflare/types/header.py
+++ b/src/cloudflare/types/load_balancers/header.py
@@ -5,7 +5,7 @@
from pydantic import Field as FieldInfo
from .host import Host
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["Header"]
diff --git a/src/cloudflare/types/header_param.py b/src/cloudflare/types/load_balancers/header_param.py
similarity index 93%
rename from src/cloudflare/types/header_param.py
rename to src/cloudflare/types/load_balancers/header_param.py
index f51faaa43c2..b3e837d92f9 100644
--- a/src/cloudflare/types/header_param.py
+++ b/src/cloudflare/types/load_balancers/header_param.py
@@ -6,7 +6,7 @@
from typing_extensions import Annotated, TypedDict
from .host import Host
-from .._utils import PropertyInfo
+from ..._utils import PropertyInfo
__all__ = ["HeaderParam"]
diff --git a/src/cloudflare/types/host.py b/src/cloudflare/types/load_balancers/host.py
similarity index 100%
rename from src/cloudflare/types/host.py
rename to src/cloudflare/types/load_balancers/host.py
diff --git a/src/cloudflare/types/load_balancer.py b/src/cloudflare/types/load_balancers/load_balancer.py
similarity index 99%
rename from src/cloudflare/types/load_balancer.py
rename to src/cloudflare/types/load_balancers/load_balancer.py
index 7f6b1bac1c9..242171cacb2 100644
--- a/src/cloudflare/types/load_balancer.py
+++ b/src/cloudflare/types/load_balancers/load_balancer.py
@@ -5,7 +5,7 @@
from typing_extensions import Literal
from .rules import Rules
-from .._models import BaseModel
+from ..._models import BaseModel
from .default_pools import DefaultPools
from .random_steering import RandomSteering
from .adaptive_routing import AdaptiveRouting
diff --git a/src/cloudflare/types/load_balancer_create_params.py b/src/cloudflare/types/load_balancers/load_balancer_create_params.py
similarity index 100%
rename from src/cloudflare/types/load_balancer_create_params.py
rename to src/cloudflare/types/load_balancers/load_balancer_create_params.py
diff --git a/src/cloudflare/types/load_balancer_delete_params.py b/src/cloudflare/types/load_balancers/load_balancer_delete_params.py
similarity index 100%
rename from src/cloudflare/types/load_balancer_delete_params.py
rename to src/cloudflare/types/load_balancers/load_balancer_delete_params.py
diff --git a/src/cloudflare/types/load_balancer_delete_response.py b/src/cloudflare/types/load_balancers/load_balancer_delete_response.py
similarity index 87%
rename from src/cloudflare/types/load_balancer_delete_response.py
rename to src/cloudflare/types/load_balancers/load_balancer_delete_response.py
index 3e1b9e93ee2..d7c7046d701 100644
--- a/src/cloudflare/types/load_balancer_delete_response.py
+++ b/src/cloudflare/types/load_balancers/load_balancer_delete_response.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["LoadBalancerDeleteResponse"]
diff --git a/src/cloudflare/types/load_balancer_edit_params.py b/src/cloudflare/types/load_balancers/load_balancer_edit_params.py
similarity index 100%
rename from src/cloudflare/types/load_balancer_edit_params.py
rename to src/cloudflare/types/load_balancers/load_balancer_edit_params.py
diff --git a/src/cloudflare/types/load_balancer_update_params.py b/src/cloudflare/types/load_balancers/load_balancer_update_params.py
similarity index 100%
rename from src/cloudflare/types/load_balancer_update_params.py
rename to src/cloudflare/types/load_balancers/load_balancer_update_params.py
diff --git a/src/cloudflare/types/load_shedding.py b/src/cloudflare/types/load_balancers/load_shedding.py
similarity index 96%
rename from src/cloudflare/types/load_shedding.py
rename to src/cloudflare/types/load_balancers/load_shedding.py
index 85c4ad63952..882b6787d30 100644
--- a/src/cloudflare/types/load_shedding.py
+++ b/src/cloudflare/types/load_balancers/load_shedding.py
@@ -3,7 +3,7 @@
from typing import Optional
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["LoadShedding"]
diff --git a/src/cloudflare/types/load_shedding_param.py b/src/cloudflare/types/load_balancers/load_shedding_param.py
similarity index 100%
rename from src/cloudflare/types/load_shedding_param.py
rename to src/cloudflare/types/load_balancers/load_shedding_param.py
diff --git a/src/cloudflare/types/location_strategy.py b/src/cloudflare/types/load_balancers/location_strategy.py
similarity index 96%
rename from src/cloudflare/types/location_strategy.py
rename to src/cloudflare/types/load_balancers/location_strategy.py
index d3c05ae7ebd..87853e3b5d6 100644
--- a/src/cloudflare/types/location_strategy.py
+++ b/src/cloudflare/types/load_balancers/location_strategy.py
@@ -3,7 +3,7 @@
from typing import Optional
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["LocationStrategy"]
diff --git a/src/cloudflare/types/location_strategy_param.py b/src/cloudflare/types/load_balancers/location_strategy_param.py
similarity index 100%
rename from src/cloudflare/types/location_strategy_param.py
rename to src/cloudflare/types/load_balancers/location_strategy_param.py
diff --git a/src/cloudflare/types/notification_filter.py b/src/cloudflare/types/load_balancers/notification_filter.py
similarity index 94%
rename from src/cloudflare/types/notification_filter.py
rename to src/cloudflare/types/load_balancers/notification_filter.py
index 563164efb33..de6857dea4d 100644
--- a/src/cloudflare/types/notification_filter.py
+++ b/src/cloudflare/types/load_balancers/notification_filter.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
from .filter_options import FilterOptions
__all__ = ["NotificationFilter"]
diff --git a/src/cloudflare/types/notification_filter_param.py b/src/cloudflare/types/load_balancers/notification_filter_param.py
similarity index 100%
rename from src/cloudflare/types/notification_filter_param.py
rename to src/cloudflare/types/load_balancers/notification_filter_param.py
diff --git a/src/cloudflare/types/origin.py b/src/cloudflare/types/load_balancers/origin.py
similarity index 98%
rename from src/cloudflare/types/origin.py
rename to src/cloudflare/types/load_balancers/origin.py
index f49147e0081..dda86860147 100644
--- a/src/cloudflare/types/origin.py
+++ b/src/cloudflare/types/load_balancers/origin.py
@@ -4,7 +4,7 @@
from datetime import datetime
from .header import Header
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["Origin"]
diff --git a/src/cloudflare/types/origin_param.py b/src/cloudflare/types/load_balancers/origin_param.py
similarity index 100%
rename from src/cloudflare/types/origin_param.py
rename to src/cloudflare/types/load_balancers/origin_param.py
diff --git a/src/cloudflare/types/origin_steering.py b/src/cloudflare/types/load_balancers/origin_steering.py
similarity index 97%
rename from src/cloudflare/types/origin_steering.py
rename to src/cloudflare/types/load_balancers/origin_steering.py
index a0511a636bc..e7983ceea0b 100644
--- a/src/cloudflare/types/origin_steering.py
+++ b/src/cloudflare/types/load_balancers/origin_steering.py
@@ -3,7 +3,7 @@
from typing import Optional
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["OriginSteering"]
diff --git a/src/cloudflare/types/origin_steering_param.py b/src/cloudflare/types/load_balancers/origin_steering_param.py
similarity index 100%
rename from src/cloudflare/types/origin_steering_param.py
rename to src/cloudflare/types/load_balancers/origin_steering_param.py
diff --git a/src/cloudflare/types/load_balancers/pool.py b/src/cloudflare/types/load_balancers/pool.py
index 4cc92fd7279..beb27193b3d 100644
--- a/src/cloudflare/types/load_balancers/pool.py
+++ b/src/cloudflare/types/load_balancers/pool.py
@@ -3,12 +3,12 @@
from typing import List, Optional
from datetime import datetime
-from ..origin import Origin
+from .origin import Origin
from ..._models import BaseModel
-from ..check_region import CheckRegion
-from ..load_shedding import LoadShedding
-from ..origin_steering import OriginSteering
-from ..notification_filter import NotificationFilter
+from .check_region import CheckRegion
+from .load_shedding import LoadShedding
+from .origin_steering import OriginSteering
+from .notification_filter import NotificationFilter
__all__ = ["Pool"]
diff --git a/src/cloudflare/types/load_balancers/pool_create_params.py b/src/cloudflare/types/load_balancers/pool_create_params.py
index 6b0270d5ca9..49c54c78fc0 100644
--- a/src/cloudflare/types/load_balancers/pool_create_params.py
+++ b/src/cloudflare/types/load_balancers/pool_create_params.py
@@ -5,10 +5,10 @@
from typing import Iterable, Optional
from typing_extensions import Required, TypedDict
-from ..origin_param import OriginParam
-from ..load_shedding_param import LoadSheddingParam
-from ..origin_steering_param import OriginSteeringParam
-from ..notification_filter_param import NotificationFilterParam
+from .origin_param import OriginParam
+from .load_shedding_param import LoadSheddingParam
+from .origin_steering_param import OriginSteeringParam
+from .notification_filter_param import NotificationFilterParam
__all__ = ["PoolCreateParams"]
diff --git a/src/cloudflare/types/load_balancers/pool_edit_params.py b/src/cloudflare/types/load_balancers/pool_edit_params.py
index bddc6c9b3e7..222e8ab9357 100644
--- a/src/cloudflare/types/load_balancers/pool_edit_params.py
+++ b/src/cloudflare/types/load_balancers/pool_edit_params.py
@@ -5,11 +5,11 @@
from typing import List, Iterable, Optional
from typing_extensions import Required, TypedDict
-from ..check_region import CheckRegion
-from ..origin_param import OriginParam
-from ..load_shedding_param import LoadSheddingParam
-from ..origin_steering_param import OriginSteeringParam
-from ..notification_filter_param import NotificationFilterParam
+from .check_region import CheckRegion
+from .origin_param import OriginParam
+from .load_shedding_param import LoadSheddingParam
+from .origin_steering_param import OriginSteeringParam
+from .notification_filter_param import NotificationFilterParam
__all__ = ["PoolEditParams"]
diff --git a/src/cloudflare/types/load_balancers/pool_update_params.py b/src/cloudflare/types/load_balancers/pool_update_params.py
index 9d9e88531a0..834c3ec1b70 100644
--- a/src/cloudflare/types/load_balancers/pool_update_params.py
+++ b/src/cloudflare/types/load_balancers/pool_update_params.py
@@ -5,11 +5,11 @@
from typing import List, Iterable, Optional
from typing_extensions import Required, TypedDict
-from ..check_region import CheckRegion
-from ..origin_param import OriginParam
-from ..load_shedding_param import LoadSheddingParam
-from ..origin_steering_param import OriginSteeringParam
-from ..notification_filter_param import NotificationFilterParam
+from .check_region import CheckRegion
+from .origin_param import OriginParam
+from .load_shedding_param import LoadSheddingParam
+from .origin_steering_param import OriginSteeringParam
+from .notification_filter_param import NotificationFilterParam
__all__ = ["PoolUpdateParams"]
diff --git a/src/cloudflare/types/random_steering.py b/src/cloudflare/types/load_balancers/random_steering.py
similarity index 93%
rename from src/cloudflare/types/random_steering.py
rename to src/cloudflare/types/load_balancers/random_steering.py
index 4018e9f828e..0eaa15fd484 100644
--- a/src/cloudflare/types/random_steering.py
+++ b/src/cloudflare/types/load_balancers/random_steering.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["RandomSteering"]
diff --git a/src/cloudflare/types/random_steering_param.py b/src/cloudflare/types/load_balancers/random_steering_param.py
similarity index 100%
rename from src/cloudflare/types/random_steering_param.py
rename to src/cloudflare/types/load_balancers/random_steering_param.py
diff --git a/src/cloudflare/types/rules.py b/src/cloudflare/types/load_balancers/rules.py
similarity index 99%
rename from src/cloudflare/types/rules.py
rename to src/cloudflare/types/load_balancers/rules.py
index 90272a78b56..3c0887f61c9 100644
--- a/src/cloudflare/types/rules.py
+++ b/src/cloudflare/types/load_balancers/rules.py
@@ -3,7 +3,7 @@
from typing import List, Optional
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
from .default_pools import DefaultPools
from .random_steering import RandomSteering
from .adaptive_routing import AdaptiveRouting
diff --git a/src/cloudflare/types/rules_param.py b/src/cloudflare/types/load_balancers/rules_param.py
similarity index 100%
rename from src/cloudflare/types/rules_param.py
rename to src/cloudflare/types/load_balancers/rules_param.py
diff --git a/src/cloudflare/types/session_affinity_attributes.py b/src/cloudflare/types/load_balancers/session_affinity_attributes.py
similarity index 98%
rename from src/cloudflare/types/session_affinity_attributes.py
rename to src/cloudflare/types/load_balancers/session_affinity_attributes.py
index e8a317b4a0d..10b0de12222 100644
--- a/src/cloudflare/types/session_affinity_attributes.py
+++ b/src/cloudflare/types/load_balancers/session_affinity_attributes.py
@@ -3,7 +3,7 @@
from typing import List, Optional
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["SessionAffinityAttributes"]
diff --git a/src/cloudflare/types/session_affinity_attributes_param.py b/src/cloudflare/types/load_balancers/session_affinity_attributes_param.py
similarity index 100%
rename from src/cloudflare/types/session_affinity_attributes_param.py
rename to src/cloudflare/types/load_balancers/session_affinity_attributes_param.py
diff --git a/src/cloudflare/types/magic_transit/__init__.py b/src/cloudflare/types/magic_transit/__init__.py
index cd6cd6aaf02..3e711ee7547 100644
--- a/src/cloudflare/types/magic_transit/__init__.py
+++ b/src/cloudflare/types/magic_transit/__init__.py
@@ -7,12 +7,16 @@
from .colo_name import ColoName as ColoName
from .colo_region import ColoRegion as ColoRegion
from .scope_param import ScopeParam as ScopeParam
+from .health_check import HealthCheck as HealthCheck
from .psk_metadata import PSKMetadata as PSKMetadata
from .site_location import SiteLocation as SiteLocation
from .colo_name_param import ColoNameParam as ColoNameParam
from .site_list_params import SiteListParams as SiteListParams
from .colo_region_param import ColoRegionParam as ColoRegionParam
+from .health_check_rate import HealthCheckRate as HealthCheckRate
+from .health_check_type import HealthCheckType as HealthCheckType
from .site_get_response import SiteGetResponse as SiteGetResponse
+from .health_check_param import HealthCheckParam as HealthCheckParam
from .route_empty_params import RouteEmptyParams as RouteEmptyParams
from .route_get_response import RouteGetResponse as RouteGetResponse
from .site_create_params import SiteCreateParams as SiteCreateParams
diff --git a/src/cloudflare/types/magic_transit/cf_interconnect_list_response.py b/src/cloudflare/types/magic_transit/cf_interconnect_list_response.py
index 21773a2a216..38c321caba8 100644
--- a/src/cloudflare/types/magic_transit/cf_interconnect_list_response.py
+++ b/src/cloudflare/types/magic_transit/cf_interconnect_list_response.py
@@ -4,8 +4,8 @@
from datetime import datetime
from ..._models import BaseModel
-from ..health_check_rate import HealthCheckRate
-from ..health_check_type import HealthCheckType
+from .health_check_rate import HealthCheckRate
+from .health_check_type import HealthCheckType
__all__ = ["CfInterconnectListResponse", "Interconnect", "InterconnectGRE", "InterconnectHealthCheck"]
diff --git a/src/cloudflare/types/magic_transit/cf_interconnect_update_params.py b/src/cloudflare/types/magic_transit/cf_interconnect_update_params.py
index 4a7c939b72e..00fca27a8f2 100644
--- a/src/cloudflare/types/magic_transit/cf_interconnect_update_params.py
+++ b/src/cloudflare/types/magic_transit/cf_interconnect_update_params.py
@@ -4,8 +4,8 @@
from typing_extensions import Required, TypedDict
-from ..health_check_rate import HealthCheckRate
-from ..health_check_type import HealthCheckType
+from .health_check_rate import HealthCheckRate
+from .health_check_type import HealthCheckType
__all__ = ["CfInterconnectUpdateParams", "GRE", "HealthCheck"]
diff --git a/src/cloudflare/types/magic_transit/gre_tunnel_create_response.py b/src/cloudflare/types/magic_transit/gre_tunnel_create_response.py
index 460560e3488..cb4d4c1b6ab 100644
--- a/src/cloudflare/types/magic_transit/gre_tunnel_create_response.py
+++ b/src/cloudflare/types/magic_transit/gre_tunnel_create_response.py
@@ -4,7 +4,7 @@
from datetime import datetime
from ..._models import BaseModel
-from ..health_check import HealthCheck
+from .health_check import HealthCheck
__all__ = ["GRETunnelCreateResponse", "GRETunnel"]
diff --git a/src/cloudflare/types/magic_transit/gre_tunnel_list_response.py b/src/cloudflare/types/magic_transit/gre_tunnel_list_response.py
index 989c38fc7d9..54f3538e769 100644
--- a/src/cloudflare/types/magic_transit/gre_tunnel_list_response.py
+++ b/src/cloudflare/types/magic_transit/gre_tunnel_list_response.py
@@ -4,7 +4,7 @@
from datetime import datetime
from ..._models import BaseModel
-from ..health_check import HealthCheck
+from .health_check import HealthCheck
__all__ = ["GRETunnelListResponse", "GRETunnel"]
diff --git a/src/cloudflare/types/magic_transit/gre_tunnel_update_params.py b/src/cloudflare/types/magic_transit/gre_tunnel_update_params.py
index fa4fdee6ad9..6d891bbe546 100644
--- a/src/cloudflare/types/magic_transit/gre_tunnel_update_params.py
+++ b/src/cloudflare/types/magic_transit/gre_tunnel_update_params.py
@@ -4,7 +4,7 @@
from typing_extensions import Required, TypedDict
-from ..health_check_param import HealthCheckParam
+from .health_check_param import HealthCheckParam
__all__ = ["GRETunnelUpdateParams"]
diff --git a/src/cloudflare/types/health_check.py b/src/cloudflare/types/magic_transit/health_check.py
similarity index 98%
rename from src/cloudflare/types/health_check.py
rename to src/cloudflare/types/magic_transit/health_check.py
index 24c6463d9c4..ae4874cb9ee 100644
--- a/src/cloudflare/types/health_check.py
+++ b/src/cloudflare/types/magic_transit/health_check.py
@@ -3,7 +3,7 @@
from typing import Optional
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
from .health_check_rate import HealthCheckRate
from .health_check_type import HealthCheckType
diff --git a/src/cloudflare/types/health_check_param.py b/src/cloudflare/types/magic_transit/health_check_param.py
similarity index 100%
rename from src/cloudflare/types/health_check_param.py
rename to src/cloudflare/types/magic_transit/health_check_param.py
diff --git a/src/cloudflare/types/health_check_rate.py b/src/cloudflare/types/magic_transit/health_check_rate.py
similarity index 100%
rename from src/cloudflare/types/health_check_rate.py
rename to src/cloudflare/types/magic_transit/health_check_rate.py
diff --git a/src/cloudflare/types/health_check_type.py b/src/cloudflare/types/magic_transit/health_check_type.py
similarity index 100%
rename from src/cloudflare/types/health_check_type.py
rename to src/cloudflare/types/magic_transit/health_check_type.py
diff --git a/src/cloudflare/types/magic_transit/ipsec_tunnel_create_params.py b/src/cloudflare/types/magic_transit/ipsec_tunnel_create_params.py
index 43e1350e98e..1b59178828f 100644
--- a/src/cloudflare/types/magic_transit/ipsec_tunnel_create_params.py
+++ b/src/cloudflare/types/magic_transit/ipsec_tunnel_create_params.py
@@ -4,7 +4,7 @@
from typing_extensions import Required, TypedDict
-from ..health_check_param import HealthCheckParam
+from .health_check_param import HealthCheckParam
__all__ = ["IPSECTunnelCreateParams"]
diff --git a/src/cloudflare/types/magic_transit/ipsec_tunnel_create_response.py b/src/cloudflare/types/magic_transit/ipsec_tunnel_create_response.py
index 0b9e0b69a2b..21de60ecfcb 100644
--- a/src/cloudflare/types/magic_transit/ipsec_tunnel_create_response.py
+++ b/src/cloudflare/types/magic_transit/ipsec_tunnel_create_response.py
@@ -5,8 +5,8 @@
from ..._models import BaseModel
from .psk_metadata import PSKMetadata
-from ..health_check_rate import HealthCheckRate
-from ..health_check_type import HealthCheckType
+from .health_check_rate import HealthCheckRate
+from .health_check_type import HealthCheckType
__all__ = ["IPSECTunnelCreateResponse", "IPSECTunnel", "IPSECTunnelTunnelHealthCheck"]
diff --git a/src/cloudflare/types/magic_transit/ipsec_tunnel_list_response.py b/src/cloudflare/types/magic_transit/ipsec_tunnel_list_response.py
index 9b45fd11650..7001f0e4eaa 100644
--- a/src/cloudflare/types/magic_transit/ipsec_tunnel_list_response.py
+++ b/src/cloudflare/types/magic_transit/ipsec_tunnel_list_response.py
@@ -5,8 +5,8 @@
from ..._models import BaseModel
from .psk_metadata import PSKMetadata
-from ..health_check_rate import HealthCheckRate
-from ..health_check_type import HealthCheckType
+from .health_check_rate import HealthCheckRate
+from .health_check_type import HealthCheckType
__all__ = ["IPSECTunnelListResponse", "IPSECTunnel", "IPSECTunnelTunnelHealthCheck"]
diff --git a/src/cloudflare/types/magic_transit/ipsec_tunnel_update_params.py b/src/cloudflare/types/magic_transit/ipsec_tunnel_update_params.py
index b4ee8795320..8a0170e0345 100644
--- a/src/cloudflare/types/magic_transit/ipsec_tunnel_update_params.py
+++ b/src/cloudflare/types/magic_transit/ipsec_tunnel_update_params.py
@@ -4,7 +4,7 @@
from typing_extensions import Required, TypedDict
-from ..health_check_param import HealthCheckParam
+from .health_check_param import HealthCheckParam
__all__ = ["IPSECTunnelUpdateParams"]
diff --git a/src/cloudflare/types/managed_headers/__init__.py b/src/cloudflare/types/managed_headers/__init__.py
new file mode 100644
index 00000000000..4398e317107
--- /dev/null
+++ b/src/cloudflare/types/managed_headers/__init__.py
@@ -0,0 +1,9 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .request_model import RequestModel as RequestModel
+from .request_model_param import RequestModelParam as RequestModelParam
+from .managed_header_edit_params import ManagedHeaderEditParams as ManagedHeaderEditParams
+from .managed_header_edit_response import ManagedHeaderEditResponse as ManagedHeaderEditResponse
+from .managed_header_list_response import ManagedHeaderListResponse as ManagedHeaderListResponse
diff --git a/src/cloudflare/types/managed_header_edit_params.py b/src/cloudflare/types/managed_headers/managed_header_edit_params.py
similarity index 100%
rename from src/cloudflare/types/managed_header_edit_params.py
rename to src/cloudflare/types/managed_headers/managed_header_edit_params.py
diff --git a/src/cloudflare/types/managed_header_edit_response.py b/src/cloudflare/types/managed_headers/managed_header_edit_response.py
similarity index 97%
rename from src/cloudflare/types/managed_header_edit_response.py
rename to src/cloudflare/types/managed_headers/managed_header_edit_response.py
index 451174ad3d2..d1b0f60e8a5 100644
--- a/src/cloudflare/types/managed_header_edit_response.py
+++ b/src/cloudflare/types/managed_headers/managed_header_edit_response.py
@@ -2,7 +2,7 @@
from typing import List, Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["ManagedHeaderEditResponse", "ManagedRequestHeader", "ManagedResponseHeader"]
diff --git a/src/cloudflare/types/managed_header_list_response.py b/src/cloudflare/types/managed_headers/managed_header_list_response.py
similarity index 92%
rename from src/cloudflare/types/managed_header_list_response.py
rename to src/cloudflare/types/managed_headers/managed_header_list_response.py
index ed206d7d561..c155ecb594f 100644
--- a/src/cloudflare/types/managed_header_list_response.py
+++ b/src/cloudflare/types/managed_headers/managed_header_list_response.py
@@ -2,7 +2,7 @@
from typing import List, Optional
-from .._models import BaseModel
+from ..._models import BaseModel
from .request_model import RequestModel
__all__ = ["ManagedHeaderListResponse"]
diff --git a/src/cloudflare/types/request_model.py b/src/cloudflare/types/managed_headers/request_model.py
similarity index 91%
rename from src/cloudflare/types/request_model.py
rename to src/cloudflare/types/managed_headers/request_model.py
index 29753dd83e6..281db0613d3 100644
--- a/src/cloudflare/types/request_model.py
+++ b/src/cloudflare/types/managed_headers/request_model.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["RequestModel"]
diff --git a/src/cloudflare/types/request_model_param.py b/src/cloudflare/types/managed_headers/request_model_param.py
similarity index 100%
rename from src/cloudflare/types/request_model_param.py
rename to src/cloudflare/types/managed_headers/request_model_param.py
diff --git a/src/cloudflare/types/memberships/__init__.py b/src/cloudflare/types/memberships/__init__.py
new file mode 100644
index 00000000000..995d1aee7dd
--- /dev/null
+++ b/src/cloudflare/types/memberships/__init__.py
@@ -0,0 +1,11 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .membership import Membership as Membership
+from .membership_list_params import MembershipListParams as MembershipListParams
+from .membership_get_response import MembershipGetResponse as MembershipGetResponse
+from .membership_delete_params import MembershipDeleteParams as MembershipDeleteParams
+from .membership_update_params import MembershipUpdateParams as MembershipUpdateParams
+from .membership_delete_response import MembershipDeleteResponse as MembershipDeleteResponse
+from .membership_update_response import MembershipUpdateResponse as MembershipUpdateResponse
diff --git a/src/cloudflare/types/membership.py b/src/cloudflare/types/memberships/membership.py
similarity index 93%
rename from src/cloudflare/types/membership.py
rename to src/cloudflare/types/memberships/membership.py
index ea367a09125..4b1d9003fd1 100644
--- a/src/cloudflare/types/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 .account import Account
-from .._models import BaseModel
+from ..shared import PermissionGrant
+from ..._models import BaseModel
+from ..accounts import Account
__all__ = ["Membership", "Permissions"]
diff --git a/src/cloudflare/types/membership_delete_params.py b/src/cloudflare/types/memberships/membership_delete_params.py
similarity index 100%
rename from src/cloudflare/types/membership_delete_params.py
rename to src/cloudflare/types/memberships/membership_delete_params.py
diff --git a/src/cloudflare/types/membership_delete_response.py b/src/cloudflare/types/memberships/membership_delete_response.py
similarity index 89%
rename from src/cloudflare/types/membership_delete_response.py
rename to src/cloudflare/types/memberships/membership_delete_response.py
index 9b050610501..8d11b2170ff 100644
--- a/src/cloudflare/types/membership_delete_response.py
+++ b/src/cloudflare/types/memberships/membership_delete_response.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["MembershipDeleteResponse"]
diff --git a/src/cloudflare/types/membership_get_response.py b/src/cloudflare/types/memberships/membership_get_response.py
similarity index 100%
rename from src/cloudflare/types/membership_get_response.py
rename to src/cloudflare/types/memberships/membership_get_response.py
diff --git a/src/cloudflare/types/membership_list_params.py b/src/cloudflare/types/memberships/membership_list_params.py
similarity index 100%
rename from src/cloudflare/types/membership_list_params.py
rename to src/cloudflare/types/memberships/membership_list_params.py
diff --git a/src/cloudflare/types/membership_update_params.py b/src/cloudflare/types/memberships/membership_update_params.py
similarity index 100%
rename from src/cloudflare/types/membership_update_params.py
rename to src/cloudflare/types/memberships/membership_update_params.py
diff --git a/src/cloudflare/types/membership_update_response.py b/src/cloudflare/types/memberships/membership_update_response.py
similarity index 100%
rename from src/cloudflare/types/membership_update_response.py
rename to src/cloudflare/types/memberships/membership_update_response.py
diff --git a/src/cloudflare/types/mtls_certificates/__init__.py b/src/cloudflare/types/mtls_certificates/__init__.py
index fda57c250bd..b359b0145f6 100644
--- a/src/cloudflare/types/mtls_certificates/__init__.py
+++ b/src/cloudflare/types/mtls_certificates/__init__.py
@@ -2,5 +2,9 @@
from __future__ import annotations
+from .mtls_certificate import MTLSCertificate as MTLSCertificate
from .association_get_response import AssociationGetResponse as AssociationGetResponse
from .certificate_asssociation import CertificateAsssociation as CertificateAsssociation
+from .mtls_certificate_create_params import MTLSCertificateCreateParams as MTLSCertificateCreateParams
+from .mtls_certificate_delete_params import MTLSCertificateDeleteParams as MTLSCertificateDeleteParams
+from .mtls_certificate_create_response import MTLSCertificateCreateResponse as MTLSCertificateCreateResponse
diff --git a/src/cloudflare/types/mtls_certificate.py b/src/cloudflare/types/mtls_certificates/mtls_certificate.py
similarity index 96%
rename from src/cloudflare/types/mtls_certificate.py
rename to src/cloudflare/types/mtls_certificates/mtls_certificate.py
index c710efe811b..4b7a1e5f350 100644
--- a/src/cloudflare/types/mtls_certificate.py
+++ b/src/cloudflare/types/mtls_certificates/mtls_certificate.py
@@ -3,7 +3,7 @@
from typing import Optional
from datetime import datetime
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["MTLSCertificate"]
diff --git a/src/cloudflare/types/mtls_certificate_create_params.py b/src/cloudflare/types/mtls_certificates/mtls_certificate_create_params.py
similarity index 100%
rename from src/cloudflare/types/mtls_certificate_create_params.py
rename to src/cloudflare/types/mtls_certificates/mtls_certificate_create_params.py
diff --git a/src/cloudflare/types/mtls_certificate_create_response.py b/src/cloudflare/types/mtls_certificates/mtls_certificate_create_response.py
similarity index 97%
rename from src/cloudflare/types/mtls_certificate_create_response.py
rename to src/cloudflare/types/mtls_certificates/mtls_certificate_create_response.py
index ed93644d273..4d1bd959fa6 100644
--- a/src/cloudflare/types/mtls_certificate_create_response.py
+++ b/src/cloudflare/types/mtls_certificates/mtls_certificate_create_response.py
@@ -3,7 +3,7 @@
from typing import Optional
from datetime import datetime
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["MTLSCertificateCreateResponse"]
diff --git a/src/cloudflare/types/mtls_certificate_delete_params.py b/src/cloudflare/types/mtls_certificates/mtls_certificate_delete_params.py
similarity index 100%
rename from src/cloudflare/types/mtls_certificate_delete_params.py
rename to src/cloudflare/types/mtls_certificates/mtls_certificate_delete_params.py
diff --git a/src/cloudflare/types/origin_ca_certificates/__init__.py b/src/cloudflare/types/origin_ca_certificates/__init__.py
new file mode 100644
index 00000000000..32cf6287ee3
--- /dev/null
+++ b/src/cloudflare/types/origin_ca_certificates/__init__.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .origin_ca_certificate import OriginCACertificate as OriginCACertificate
+from .origin_ca_certificate_list_params import OriginCACertificateListParams as OriginCACertificateListParams
+from .origin_ca_certificate_get_response import OriginCACertificateGetResponse as OriginCACertificateGetResponse
+from .origin_ca_certificate_create_params import OriginCACertificateCreateParams as OriginCACertificateCreateParams
+from .origin_ca_certificate_delete_params import OriginCACertificateDeleteParams as OriginCACertificateDeleteParams
+from .origin_ca_certificate_create_response import (
+ OriginCACertificateCreateResponse as OriginCACertificateCreateResponse,
+)
+from .origin_ca_certificate_delete_response import (
+ OriginCACertificateDeleteResponse as OriginCACertificateDeleteResponse,
+)
diff --git a/src/cloudflare/types/origin_ca_certificate.py b/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate.py
similarity index 97%
rename from src/cloudflare/types/origin_ca_certificate.py
rename to src/cloudflare/types/origin_ca_certificates/origin_ca_certificate.py
index ab907dbf02b..ad5a77af9d4 100644
--- a/src/cloudflare/types/origin_ca_certificate.py
+++ b/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate.py
@@ -4,7 +4,7 @@
from datetime import datetime
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["OriginCACertificate"]
diff --git a/src/cloudflare/types/origin_ca_certificate_create_params.py b/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_create_params.py
similarity index 100%
rename from src/cloudflare/types/origin_ca_certificate_create_params.py
rename to src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_create_params.py
diff --git a/src/cloudflare/types/origin_ca_certificate_create_response.py b/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_create_response.py
similarity index 100%
rename from src/cloudflare/types/origin_ca_certificate_create_response.py
rename to src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_create_response.py
diff --git a/src/cloudflare/types/origin_ca_certificate_delete_params.py b/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_delete_params.py
similarity index 100%
rename from src/cloudflare/types/origin_ca_certificate_delete_params.py
rename to src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_delete_params.py
diff --git a/src/cloudflare/types/origin_ca_certificate_delete_response.py b/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_delete_response.py
similarity index 89%
rename from src/cloudflare/types/origin_ca_certificate_delete_response.py
rename to src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_delete_response.py
index ac83d7b288e..0077aa46b31 100644
--- a/src/cloudflare/types/origin_ca_certificate_delete_response.py
+++ b/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_delete_response.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["OriginCACertificateDeleteResponse"]
diff --git a/src/cloudflare/types/origin_ca_certificate_get_response.py b/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_get_response.py
similarity index 100%
rename from src/cloudflare/types/origin_ca_certificate_get_response.py
rename to src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_get_response.py
diff --git a/src/cloudflare/types/origin_ca_certificate_list_params.py b/src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_list_params.py
similarity index 100%
rename from src/cloudflare/types/origin_ca_certificate_list_params.py
rename to src/cloudflare/types/origin_ca_certificates/origin_ca_certificate_list_params.py
diff --git a/src/cloudflare/types/origin_post_quantum_encryption/__init__.py b/src/cloudflare/types/origin_post_quantum_encryption/__init__.py
new file mode 100644
index 00000000000..31525d2b891
--- /dev/null
+++ b/src/cloudflare/types/origin_post_quantum_encryption/__init__.py
@@ -0,0 +1,13 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .origin_post_quantum_encryption_get_response import (
+ OriginPostQuantumEncryptionGetResponse as OriginPostQuantumEncryptionGetResponse,
+)
+from .origin_post_quantum_encryption_update_params import (
+ OriginPostQuantumEncryptionUpdateParams as OriginPostQuantumEncryptionUpdateParams,
+)
+from .origin_post_quantum_encryption_update_response import (
+ OriginPostQuantumEncryptionUpdateResponse as OriginPostQuantumEncryptionUpdateResponse,
+)
diff --git a/src/cloudflare/types/origin_post_quantum_encryption_get_response.py b/src/cloudflare/types/origin_post_quantum_encryption/origin_post_quantum_encryption_get_response.py
similarity index 100%
rename from src/cloudflare/types/origin_post_quantum_encryption_get_response.py
rename to src/cloudflare/types/origin_post_quantum_encryption/origin_post_quantum_encryption_get_response.py
diff --git a/src/cloudflare/types/origin_post_quantum_encryption_update_params.py b/src/cloudflare/types/origin_post_quantum_encryption/origin_post_quantum_encryption_update_params.py
similarity index 100%
rename from src/cloudflare/types/origin_post_quantum_encryption_update_params.py
rename to src/cloudflare/types/origin_post_quantum_encryption/origin_post_quantum_encryption_update_params.py
diff --git a/src/cloudflare/types/origin_post_quantum_encryption_update_response.py b/src/cloudflare/types/origin_post_quantum_encryption/origin_post_quantum_encryption_update_response.py
similarity index 100%
rename from src/cloudflare/types/origin_post_quantum_encryption_update_response.py
rename to src/cloudflare/types/origin_post_quantum_encryption/origin_post_quantum_encryption_update_response.py
diff --git a/src/cloudflare/types/origin_tls_client_auth/__init__.py b/src/cloudflare/types/origin_tls_client_auth/__init__.py
index 608cef2cd9d..eba7c27e23a 100644
--- a/src/cloudflare/types/origin_tls_client_auth/__init__.py
+++ b/src/cloudflare/types/origin_tls_client_auth/__init__.py
@@ -8,3 +8,13 @@
from .setting_update_response import SettingUpdateResponse as SettingUpdateResponse
from .hostname_update_response import HostnameUpdateResponse as HostnameUpdateResponse
from .authenticated_origin_pull import AuthenticatedOriginPull as AuthenticatedOriginPull
+from .zone_authenticated_origin_pull import ZoneAuthenticatedOriginPull as ZoneAuthenticatedOriginPull
+from .origin_tls_client_auth_get_response import OriginTLSClientAuthGetResponse as OriginTLSClientAuthGetResponse
+from .origin_tls_client_auth_create_params import OriginTLSClientAuthCreateParams as OriginTLSClientAuthCreateParams
+from .origin_tls_client_auth_delete_params import OriginTLSClientAuthDeleteParams as OriginTLSClientAuthDeleteParams
+from .origin_tls_client_auth_create_response import (
+ OriginTLSClientAuthCreateResponse as OriginTLSClientAuthCreateResponse,
+)
+from .origin_tls_client_auth_delete_response import (
+ OriginTLSClientAuthDeleteResponse as OriginTLSClientAuthDeleteResponse,
+)
diff --git a/src/cloudflare/types/origin_tls_client_auth_create_params.py b/src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_create_params.py
similarity index 100%
rename from src/cloudflare/types/origin_tls_client_auth_create_params.py
rename to src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_create_params.py
diff --git a/src/cloudflare/types/origin_tls_client_auth_create_response.py b/src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_create_response.py
similarity index 100%
rename from src/cloudflare/types/origin_tls_client_auth_create_response.py
rename to src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_create_response.py
diff --git a/src/cloudflare/types/origin_tls_client_auth_delete_params.py b/src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_delete_params.py
similarity index 100%
rename from src/cloudflare/types/origin_tls_client_auth_delete_params.py
rename to src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_delete_params.py
diff --git a/src/cloudflare/types/origin_tls_client_auth_delete_response.py b/src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_delete_response.py
similarity index 100%
rename from src/cloudflare/types/origin_tls_client_auth_delete_response.py
rename to src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_delete_response.py
diff --git a/src/cloudflare/types/origin_tls_client_auth_get_response.py b/src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_get_response.py
similarity index 100%
rename from src/cloudflare/types/origin_tls_client_auth_get_response.py
rename to src/cloudflare/types/origin_tls_client_auth/origin_tls_client_auth_get_response.py
diff --git a/src/cloudflare/types/zone_authenticated_origin_pull.py b/src/cloudflare/types/origin_tls_client_auth/zone_authenticated_origin_pull.py
similarity index 97%
rename from src/cloudflare/types/zone_authenticated_origin_pull.py
rename to src/cloudflare/types/origin_tls_client_auth/zone_authenticated_origin_pull.py
index 0dd3da6f667..77c12a377eb 100644
--- a/src/cloudflare/types/zone_authenticated_origin_pull.py
+++ b/src/cloudflare/types/origin_tls_client_auth/zone_authenticated_origin_pull.py
@@ -4,7 +4,7 @@
from datetime import datetime
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["ZoneAuthenticatedOriginPull"]
diff --git a/src/cloudflare/types/page_shield/__init__.py b/src/cloudflare/types/page_shield/__init__.py
index e0cb731ced5..39cbf2d6c29 100644
--- a/src/cloudflare/types/page_shield/__init__.py
+++ b/src/cloudflare/types/page_shield/__init__.py
@@ -4,6 +4,7 @@
from .policy import Policy as Policy
from .script import Script as Script
+from .setting import Setting as Setting
from .connection import Connection as Connection
from .policy_param import PolicyParam as PolicyParam
from .script_list_params import ScriptListParams as ScriptListParams
@@ -11,3 +12,5 @@
from .policy_create_params import PolicyCreateParams as PolicyCreateParams
from .policy_update_params import PolicyUpdateParams as PolicyUpdateParams
from .connection_list_params import ConnectionListParams as ConnectionListParams
+from .page_shield_update_params import PageShieldUpdateParams as PageShieldUpdateParams
+from .page_shield_update_response import PageShieldUpdateResponse as PageShieldUpdateResponse
diff --git a/src/cloudflare/types/page_shield_update_params.py b/src/cloudflare/types/page_shield/page_shield_update_params.py
similarity index 100%
rename from src/cloudflare/types/page_shield_update_params.py
rename to src/cloudflare/types/page_shield/page_shield_update_params.py
diff --git a/src/cloudflare/types/page_shield_update_response.py b/src/cloudflare/types/page_shield/page_shield_update_response.py
similarity index 95%
rename from src/cloudflare/types/page_shield_update_response.py
rename to src/cloudflare/types/page_shield/page_shield_update_response.py
index 02a8f02ce62..d0410913b2d 100644
--- a/src/cloudflare/types/page_shield_update_response.py
+++ b/src/cloudflare/types/page_shield/page_shield_update_response.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["PageShieldUpdateResponse"]
diff --git a/src/cloudflare/types/setting.py b/src/cloudflare/types/page_shield/setting.py
similarity index 95%
rename from src/cloudflare/types/setting.py
rename to src/cloudflare/types/page_shield/setting.py
index fc42f6b0f75..fee7e5dc567 100644
--- a/src/cloudflare/types/setting.py
+++ b/src/cloudflare/types/page_shield/setting.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["Setting"]
diff --git a/src/cloudflare/types/pagerules/__init__.py b/src/cloudflare/types/pagerules/__init__.py
index edc29b2cce6..50e8f79dd7e 100644
--- a/src/cloudflare/types/pagerules/__init__.py
+++ b/src/cloudflare/types/pagerules/__init__.py
@@ -2,4 +2,20 @@
from __future__ import annotations
+from .route import Route as Route
+from .target import Target as Target
+from .page_rule import PageRule as PageRule
+from .route_param import RouteParam as RouteParam
+from .target_param import TargetParam as TargetParam
+from .pagerule_edit_params import PageruleEditParams as PageruleEditParams
+from .pagerule_list_params import PageruleListParams as PageruleListParams
+from .pagerule_get_response import PageruleGetResponse as PageruleGetResponse
from .setting_list_response import SettingListResponse as SettingListResponse
+from .pagerule_create_params import PageruleCreateParams as PageruleCreateParams
+from .pagerule_delete_params import PageruleDeleteParams as PageruleDeleteParams
+from .pagerule_edit_response import PageruleEditResponse as PageruleEditResponse
+from .pagerule_list_response import PageruleListResponse as PageruleListResponse
+from .pagerule_update_params import PageruleUpdateParams as PageruleUpdateParams
+from .pagerule_create_response import PageruleCreateResponse as PageruleCreateResponse
+from .pagerule_delete_response import PageruleDeleteResponse as PageruleDeleteResponse
+from .pagerule_update_response import PageruleUpdateResponse as PageruleUpdateResponse
diff --git a/src/cloudflare/types/page_rule.py b/src/cloudflare/types/pagerules/page_rule.py
similarity index 97%
rename from src/cloudflare/types/page_rule.py
rename to src/cloudflare/types/pagerules/page_rule.py
index ce052dd09e5..d7a0d1b8117 100644
--- a/src/cloudflare/types/page_rule.py
+++ b/src/cloudflare/types/pagerules/page_rule.py
@@ -6,7 +6,7 @@
from .route import Route
from .target import Target
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["PageRule"]
diff --git a/src/cloudflare/types/pagerule_create_params.py b/src/cloudflare/types/pagerules/pagerule_create_params.py
similarity index 100%
rename from src/cloudflare/types/pagerule_create_params.py
rename to src/cloudflare/types/pagerules/pagerule_create_params.py
diff --git a/src/cloudflare/types/pagerule_create_response.py b/src/cloudflare/types/pagerules/pagerule_create_response.py
similarity index 100%
rename from src/cloudflare/types/pagerule_create_response.py
rename to src/cloudflare/types/pagerules/pagerule_create_response.py
diff --git a/src/cloudflare/types/pagerule_delete_params.py b/src/cloudflare/types/pagerules/pagerule_delete_params.py
similarity index 100%
rename from src/cloudflare/types/pagerule_delete_params.py
rename to src/cloudflare/types/pagerules/pagerule_delete_params.py
diff --git a/src/cloudflare/types/pagerule_delete_response.py b/src/cloudflare/types/pagerules/pagerule_delete_response.py
similarity index 85%
rename from src/cloudflare/types/pagerule_delete_response.py
rename to src/cloudflare/types/pagerules/pagerule_delete_response.py
index fc24b77da16..c7ddf323320 100644
--- a/src/cloudflare/types/pagerule_delete_response.py
+++ b/src/cloudflare/types/pagerules/pagerule_delete_response.py
@@ -1,6 +1,6 @@
# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["PageruleDeleteResponse"]
diff --git a/src/cloudflare/types/pagerule_edit_params.py b/src/cloudflare/types/pagerules/pagerule_edit_params.py
similarity index 100%
rename from src/cloudflare/types/pagerule_edit_params.py
rename to src/cloudflare/types/pagerules/pagerule_edit_params.py
diff --git a/src/cloudflare/types/pagerule_edit_response.py b/src/cloudflare/types/pagerules/pagerule_edit_response.py
similarity index 100%
rename from src/cloudflare/types/pagerule_edit_response.py
rename to src/cloudflare/types/pagerules/pagerule_edit_response.py
diff --git a/src/cloudflare/types/pagerule_get_response.py b/src/cloudflare/types/pagerules/pagerule_get_response.py
similarity index 100%
rename from src/cloudflare/types/pagerule_get_response.py
rename to src/cloudflare/types/pagerules/pagerule_get_response.py
diff --git a/src/cloudflare/types/pagerule_list_params.py b/src/cloudflare/types/pagerules/pagerule_list_params.py
similarity index 100%
rename from src/cloudflare/types/pagerule_list_params.py
rename to src/cloudflare/types/pagerules/pagerule_list_params.py
diff --git a/src/cloudflare/types/pagerule_list_response.py b/src/cloudflare/types/pagerules/pagerule_list_response.py
similarity index 100%
rename from src/cloudflare/types/pagerule_list_response.py
rename to src/cloudflare/types/pagerules/pagerule_list_response.py
diff --git a/src/cloudflare/types/pagerule_update_params.py b/src/cloudflare/types/pagerules/pagerule_update_params.py
similarity index 100%
rename from src/cloudflare/types/pagerule_update_params.py
rename to src/cloudflare/types/pagerules/pagerule_update_params.py
diff --git a/src/cloudflare/types/pagerule_update_response.py b/src/cloudflare/types/pagerules/pagerule_update_response.py
similarity index 100%
rename from src/cloudflare/types/pagerule_update_response.py
rename to src/cloudflare/types/pagerules/pagerule_update_response.py
diff --git a/src/cloudflare/types/route.py b/src/cloudflare/types/pagerules/route.py
similarity index 95%
rename from src/cloudflare/types/route.py
rename to src/cloudflare/types/pagerules/route.py
index 35dce363644..df4910ea5d4 100644
--- a/src/cloudflare/types/route.py
+++ b/src/cloudflare/types/pagerules/route.py
@@ -4,7 +4,7 @@
from datetime import datetime
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["Route", "Value"]
diff --git a/src/cloudflare/types/route_param.py b/src/cloudflare/types/pagerules/route_param.py
similarity index 100%
rename from src/cloudflare/types/route_param.py
rename to src/cloudflare/types/pagerules/route_param.py
diff --git a/src/cloudflare/types/target.py b/src/cloudflare/types/pagerules/target.py
similarity index 95%
rename from src/cloudflare/types/target.py
rename to src/cloudflare/types/pagerules/target.py
index c421e3bf217..f15c3acef68 100644
--- a/src/cloudflare/types/target.py
+++ b/src/cloudflare/types/pagerules/target.py
@@ -2,7 +2,7 @@
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["Target", "Constraint"]
diff --git a/src/cloudflare/types/target_param.py b/src/cloudflare/types/pagerules/target_param.py
similarity index 100%
rename from src/cloudflare/types/target_param.py
rename to src/cloudflare/types/pagerules/target_param.py
diff --git a/src/cloudflare/types/pcaps/__init__.py b/src/cloudflare/types/pcaps/__init__.py
index 48f330a9b1a..771b78a0850 100644
--- a/src/cloudflare/types/pcaps/__init__.py
+++ b/src/cloudflare/types/pcaps/__init__.py
@@ -2,7 +2,14 @@
from __future__ import annotations
+from .pcap import PCAP as PCAP
from .ownership import Ownership as Ownership
+from .pcap_filter import PCAPFilter as PCAPFilter
+from .pcap_filter_param import PCAPFilterParam as PCAPFilterParam
+from .pcap_get_response import PCAPGetResponse as PCAPGetResponse
+from .pcap_create_params import PCAPCreateParams as PCAPCreateParams
+from .pcap_list_response import PCAPListResponse as PCAPListResponse
+from .pcap_create_response import PCAPCreateResponse as PCAPCreateResponse
from .ownership_get_response import OwnershipGetResponse as OwnershipGetResponse
from .ownership_create_params import OwnershipCreateParams as OwnershipCreateParams
from .ownership_validate_params import OwnershipValidateParams as OwnershipValidateParams
diff --git a/src/cloudflare/types/pcap.py b/src/cloudflare/types/pcaps/pcap.py
similarity index 97%
rename from src/cloudflare/types/pcap.py
rename to src/cloudflare/types/pcaps/pcap.py
index e7747ac6c7b..849b466015c 100644
--- a/src/cloudflare/types/pcap.py
+++ b/src/cloudflare/types/pcaps/pcap.py
@@ -3,7 +3,7 @@
from typing import Optional
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
from .pcap_filter import PCAPFilter
__all__ = ["PCAP"]
diff --git a/src/cloudflare/types/pcap_create_params.py b/src/cloudflare/types/pcaps/pcap_create_params.py
similarity index 100%
rename from src/cloudflare/types/pcap_create_params.py
rename to src/cloudflare/types/pcaps/pcap_create_params.py
diff --git a/src/cloudflare/types/pcap_create_response.py b/src/cloudflare/types/pcaps/pcap_create_response.py
similarity index 98%
rename from src/cloudflare/types/pcap_create_response.py
rename to src/cloudflare/types/pcaps/pcap_create_response.py
index bc485c792af..8517c09d2dd 100644
--- a/src/cloudflare/types/pcap_create_response.py
+++ b/src/cloudflare/types/pcaps/pcap_create_response.py
@@ -4,7 +4,7 @@
from typing_extensions import Literal
from .pcap import PCAP
-from .._models import BaseModel
+from ..._models import BaseModel
from .pcap_filter import PCAPFilter
__all__ = ["PCAPCreateResponse", "MagicVisibilityPCAPsResponseFull"]
diff --git a/src/cloudflare/types/pcap_filter.py b/src/cloudflare/types/pcaps/pcap_filter.py
similarity index 94%
rename from src/cloudflare/types/pcap_filter.py
rename to src/cloudflare/types/pcaps/pcap_filter.py
index a9b2089caaf..edc1d8d3402 100644
--- a/src/cloudflare/types/pcap_filter.py
+++ b/src/cloudflare/types/pcaps/pcap_filter.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["PCAPFilter"]
diff --git a/src/cloudflare/types/pcap_filter_param.py b/src/cloudflare/types/pcaps/pcap_filter_param.py
similarity index 100%
rename from src/cloudflare/types/pcap_filter_param.py
rename to src/cloudflare/types/pcaps/pcap_filter_param.py
diff --git a/src/cloudflare/types/pcap_get_response.py b/src/cloudflare/types/pcaps/pcap_get_response.py
similarity index 98%
rename from src/cloudflare/types/pcap_get_response.py
rename to src/cloudflare/types/pcaps/pcap_get_response.py
index 90fc82c13c2..4b4ad1e9783 100644
--- a/src/cloudflare/types/pcap_get_response.py
+++ b/src/cloudflare/types/pcaps/pcap_get_response.py
@@ -4,7 +4,7 @@
from typing_extensions import Literal
from .pcap import PCAP
-from .._models import BaseModel
+from ..._models import BaseModel
from .pcap_filter import PCAPFilter
__all__ = ["PCAPGetResponse", "MagicVisibilityPCAPsResponseFull"]
diff --git a/src/cloudflare/types/pcap_list_response.py b/src/cloudflare/types/pcaps/pcap_list_response.py
similarity index 98%
rename from src/cloudflare/types/pcap_list_response.py
rename to src/cloudflare/types/pcaps/pcap_list_response.py
index 561390a79cc..ff1039713b4 100644
--- a/src/cloudflare/types/pcap_list_response.py
+++ b/src/cloudflare/types/pcaps/pcap_list_response.py
@@ -4,7 +4,7 @@
from typing_extensions import Literal
from .pcap import PCAP
-from .._models import BaseModel
+from ..._models import BaseModel
from .pcap_filter import PCAPFilter
__all__ = ["PCAPListResponse", "MagicVisibilityPCAPsResponseFull"]
diff --git a/src/cloudflare/types/plans/__init__.py b/src/cloudflare/types/plans/__init__.py
new file mode 100644
index 00000000000..372a262131e
--- /dev/null
+++ b/src/cloudflare/types/plans/__init__.py
@@ -0,0 +1,5 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .available_rate_plan import AvailableRatePlan as AvailableRatePlan
diff --git a/src/cloudflare/types/available_rate_plan.py b/src/cloudflare/types/plans/available_rate_plan.py
similarity index 97%
rename from src/cloudflare/types/available_rate_plan.py
rename to src/cloudflare/types/plans/available_rate_plan.py
index be2c65e3f7c..b898fa23ed7 100644
--- a/src/cloudflare/types/available_rate_plan.py
+++ b/src/cloudflare/types/plans/available_rate_plan.py
@@ -3,7 +3,7 @@
from typing import Optional
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["AvailableRatePlan"]
diff --git a/src/cloudflare/types/queues/__init__.py b/src/cloudflare/types/queues/__init__.py
index f8ec018f5b0..8546525267f 100644
--- a/src/cloudflare/types/queues/__init__.py
+++ b/src/cloudflare/types/queues/__init__.py
@@ -2,12 +2,19 @@
from __future__ import annotations
+from .queue import Queue as Queue
from .consumer import Consumer as Consumer
+from .queue_created import QueueCreated as QueueCreated
+from .queue_updated import QueueUpdated as QueueUpdated
from .message_ack_params import MessageAckParams as MessageAckParams
from .message_pull_params import MessagePullParams as MessagePullParams
+from .queue_create_params import QueueCreateParams as QueueCreateParams
+from .queue_delete_params import QueueDeleteParams as QueueDeleteParams
+from .queue_update_params import QueueUpdateParams as QueueUpdateParams
from .message_ack_response import MessageAckResponse as MessageAckResponse
from .consumer_get_response import ConsumerGetResponse as ConsumerGetResponse
from .message_pull_response import MessagePullResponse as MessagePullResponse
+from .queue_delete_response import QueueDeleteResponse as QueueDeleteResponse
from .consumer_create_params import ConsumerCreateParams as ConsumerCreateParams
from .consumer_delete_params import ConsumerDeleteParams as ConsumerDeleteParams
from .consumer_update_params import ConsumerUpdateParams as ConsumerUpdateParams
diff --git a/src/cloudflare/types/queue.py b/src/cloudflare/types/queues/queue.py
similarity index 93%
rename from src/cloudflare/types/queue.py
rename to src/cloudflare/types/queues/queue.py
index 6ba9cf7141e..433e60db89c 100644
--- a/src/cloudflare/types/queue.py
+++ b/src/cloudflare/types/queues/queue.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["Queue"]
diff --git a/src/cloudflare/types/queue_create_params.py b/src/cloudflare/types/queues/queue_create_params.py
similarity index 100%
rename from src/cloudflare/types/queue_create_params.py
rename to src/cloudflare/types/queues/queue_create_params.py
diff --git a/src/cloudflare/types/queue_created.py b/src/cloudflare/types/queues/queue_created.py
similarity index 91%
rename from src/cloudflare/types/queue_created.py
rename to src/cloudflare/types/queues/queue_created.py
index 6bcbffe0360..e2fe296ed31 100644
--- a/src/cloudflare/types/queue_created.py
+++ b/src/cloudflare/types/queues/queue_created.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["QueueCreated"]
diff --git a/src/cloudflare/types/queue_delete_params.py b/src/cloudflare/types/queues/queue_delete_params.py
similarity index 100%
rename from src/cloudflare/types/queue_delete_params.py
rename to src/cloudflare/types/queues/queue_delete_params.py
diff --git a/src/cloudflare/types/queue_delete_response.py b/src/cloudflare/types/queues/queue_delete_response.py
similarity index 100%
rename from src/cloudflare/types/queue_delete_response.py
rename to src/cloudflare/types/queues/queue_delete_response.py
diff --git a/src/cloudflare/types/queue_update_params.py b/src/cloudflare/types/queues/queue_update_params.py
similarity index 100%
rename from src/cloudflare/types/queue_update_params.py
rename to src/cloudflare/types/queues/queue_update_params.py
diff --git a/src/cloudflare/types/queue_updated.py b/src/cloudflare/types/queues/queue_updated.py
similarity index 91%
rename from src/cloudflare/types/queue_updated.py
rename to src/cloudflare/types/queues/queue_updated.py
index 9192a21863b..a6cc5cde5e7 100644
--- a/src/cloudflare/types/queue_updated.py
+++ b/src/cloudflare/types/queues/queue_updated.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["QueueUpdated"]
diff --git a/src/cloudflare/types/rate_limits/__init__.py b/src/cloudflare/types/rate_limits/__init__.py
new file mode 100644
index 00000000000..95fc15ad73e
--- /dev/null
+++ b/src/cloudflare/types/rate_limits/__init__.py
@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .action import Action as Action
+from .methods import Methods as Methods
+from .rate_limit import RateLimit as RateLimit
+from .rate_limit_edit_params import RateLimitEditParams as RateLimitEditParams
+from .rate_limit_list_params import RateLimitListParams as RateLimitListParams
+from .rate_limit_get_response import RateLimitGetResponse as RateLimitGetResponse
+from .rate_limit_create_params import RateLimitCreateParams as RateLimitCreateParams
+from .rate_limit_delete_params import RateLimitDeleteParams as RateLimitDeleteParams
+from .rate_limit_edit_response import RateLimitEditResponse as RateLimitEditResponse
+from .rate_limit_create_response import RateLimitCreateResponse as RateLimitCreateResponse
+from .rate_limit_delete_response import RateLimitDeleteResponse as RateLimitDeleteResponse
diff --git a/src/cloudflare/types/action.py b/src/cloudflare/types/rate_limits/action.py
similarity index 100%
rename from src/cloudflare/types/action.py
rename to src/cloudflare/types/rate_limits/action.py
diff --git a/src/cloudflare/types/methods.py b/src/cloudflare/types/rate_limits/methods.py
similarity index 100%
rename from src/cloudflare/types/methods.py
rename to src/cloudflare/types/rate_limits/methods.py
diff --git a/src/cloudflare/types/rate_limit.py b/src/cloudflare/types/rate_limits/rate_limit.py
similarity index 99%
rename from src/cloudflare/types/rate_limit.py
rename to src/cloudflare/types/rate_limits/rate_limit.py
index 202ce95e950..9fa5741af1a 100644
--- a/src/cloudflare/types/rate_limit.py
+++ b/src/cloudflare/types/rate_limits/rate_limit.py
@@ -4,7 +4,7 @@
from typing_extensions import Literal
from .methods import Methods
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["RateLimit", "Action", "ActionResponse", "Bypass", "Match", "MatchHeader", "MatchRequest", "MatchResponse"]
diff --git a/src/cloudflare/types/rate_limit_create_params.py b/src/cloudflare/types/rate_limits/rate_limit_create_params.py
similarity index 100%
rename from src/cloudflare/types/rate_limit_create_params.py
rename to src/cloudflare/types/rate_limits/rate_limit_create_params.py
diff --git a/src/cloudflare/types/rate_limit_create_response.py b/src/cloudflare/types/rate_limits/rate_limit_create_response.py
similarity index 100%
rename from src/cloudflare/types/rate_limit_create_response.py
rename to src/cloudflare/types/rate_limits/rate_limit_create_response.py
diff --git a/src/cloudflare/types/rate_limit_delete_params.py b/src/cloudflare/types/rate_limits/rate_limit_delete_params.py
similarity index 100%
rename from src/cloudflare/types/rate_limit_delete_params.py
rename to src/cloudflare/types/rate_limits/rate_limit_delete_params.py
diff --git a/src/cloudflare/types/rate_limit_delete_response.py b/src/cloudflare/types/rate_limits/rate_limit_delete_response.py
similarity index 89%
rename from src/cloudflare/types/rate_limit_delete_response.py
rename to src/cloudflare/types/rate_limits/rate_limit_delete_response.py
index ba34e2cfcb0..779d2147231 100644
--- a/src/cloudflare/types/rate_limit_delete_response.py
+++ b/src/cloudflare/types/rate_limits/rate_limit_delete_response.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["RateLimitDeleteResponse"]
diff --git a/src/cloudflare/types/rate_limit_edit_params.py b/src/cloudflare/types/rate_limits/rate_limit_edit_params.py
similarity index 100%
rename from src/cloudflare/types/rate_limit_edit_params.py
rename to src/cloudflare/types/rate_limits/rate_limit_edit_params.py
diff --git a/src/cloudflare/types/rate_limit_edit_response.py b/src/cloudflare/types/rate_limits/rate_limit_edit_response.py
similarity index 100%
rename from src/cloudflare/types/rate_limit_edit_response.py
rename to src/cloudflare/types/rate_limits/rate_limit_edit_response.py
diff --git a/src/cloudflare/types/rate_limit_get_response.py b/src/cloudflare/types/rate_limits/rate_limit_get_response.py
similarity index 100%
rename from src/cloudflare/types/rate_limit_get_response.py
rename to src/cloudflare/types/rate_limits/rate_limit_get_response.py
diff --git a/src/cloudflare/types/rate_limit_list_params.py b/src/cloudflare/types/rate_limits/rate_limit_list_params.py
similarity index 100%
rename from src/cloudflare/types/rate_limit_list_params.py
rename to src/cloudflare/types/rate_limits/rate_limit_list_params.py
diff --git a/src/cloudflare/types/rate_plans/__init__.py b/src/cloudflare/types/rate_plans/__init__.py
new file mode 100644
index 00000000000..b11a69db3bb
--- /dev/null
+++ b/src/cloudflare/types/rate_plans/__init__.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .rate_plan import RatePlan as RatePlan
+from .rate_plan_param import RatePlanParam as RatePlanParam
+from .rate_plan_get_response import RatePlanGetResponse as RatePlanGetResponse
diff --git a/src/cloudflare/types/rate_plan.py b/src/cloudflare/types/rate_plans/rate_plan.py
similarity index 97%
rename from src/cloudflare/types/rate_plan.py
rename to src/cloudflare/types/rate_plans/rate_plan.py
index 64ed960cc44..b903fed0ff6 100644
--- a/src/cloudflare/types/rate_plan.py
+++ b/src/cloudflare/types/rate_plans/rate_plan.py
@@ -3,7 +3,7 @@
from typing import List, Optional
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["RatePlan", "Component"]
diff --git a/src/cloudflare/types/rate_plan_get_response.py b/src/cloudflare/types/rate_plans/rate_plan_get_response.py
similarity index 100%
rename from src/cloudflare/types/rate_plan_get_response.py
rename to src/cloudflare/types/rate_plans/rate_plan_get_response.py
diff --git a/src/cloudflare/types/rate_plan_param.py b/src/cloudflare/types/rate_plans/rate_plan_param.py
similarity index 100%
rename from src/cloudflare/types/rate_plan_param.py
rename to src/cloudflare/types/rate_plans/rate_plan_param.py
diff --git a/src/cloudflare/types/rulesets/__init__.py b/src/cloudflare/types/rulesets/__init__.py
index 0af5349b36f..5ba52a2ca8b 100644
--- a/src/cloudflare/types/rulesets/__init__.py
+++ b/src/cloudflare/types/rulesets/__init__.py
@@ -3,6 +3,7 @@
from __future__ import annotations
from .logging import Logging as Logging
+from .ruleset import Ruleset as Ruleset
from .log_rule import LogRule as LogRule
from .skip_rule import SkipRule as SkipRule
from .block_rule import BlockRule as BlockRule
@@ -33,14 +34,19 @@
from .challenge_rule_param import ChallengeRuleParam as ChallengeRuleParam
from .rule_create_response import RuleCreateResponse as RuleCreateResponse
from .rule_delete_response import RuleDeleteResponse as RuleDeleteResponse
+from .ruleset_get_response import RulesetGetResponse as RulesetGetResponse
from .version_get_response import VersionGetResponse as VersionGetResponse
from .phase_update_response import PhaseUpdateResponse as PhaseUpdateResponse
+from .ruleset_create_params import RulesetCreateParams as RulesetCreateParams
+from .ruleset_update_params import RulesetUpdateParams as RulesetUpdateParams
from .set_config_rule_param import SetConfigRuleParam as SetConfigRuleParam
from .compress_response_rule import CompressResponseRule as CompressResponseRule
from .managed_challenge_rule import ManagedChallengeRule as ManagedChallengeRule
from .rewrite_uri_part_param import RewriteURIPartParam as RewriteURIPartParam
from .serve_error_rule_param import ServeErrorRuleParam as ServeErrorRuleParam
from .js_challenge_rule_param import JSChallengeRuleParam as JSChallengeRuleParam
+from .ruleset_create_response import RulesetCreateResponse as RulesetCreateResponse
+from .ruleset_update_response import RulesetUpdateResponse as RulesetUpdateResponse
from .set_cache_settings_rule import SetCacheSettingsRule as SetCacheSettingsRule
from .compress_response_rule_param import CompressResponseRuleParam as CompressResponseRuleParam
from .managed_challenge_rule_param import ManagedChallengeRuleParam as ManagedChallengeRuleParam
diff --git a/src/cloudflare/types/ruleset.py b/src/cloudflare/types/rulesets/ruleset.py
similarity index 98%
rename from src/cloudflare/types/ruleset.py
rename to src/cloudflare/types/rulesets/ruleset.py
index 57a0a6765be..e5973e1c4fc 100644
--- a/src/cloudflare/types/ruleset.py
+++ b/src/cloudflare/types/rulesets/ruleset.py
@@ -4,7 +4,7 @@
from datetime import datetime
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["Ruleset"]
diff --git a/src/cloudflare/types/ruleset_create_params.py b/src/cloudflare/types/rulesets/ruleset_create_params.py
similarity index 73%
rename from src/cloudflare/types/ruleset_create_params.py
rename to src/cloudflare/types/rulesets/ruleset_create_params.py
index 60b48be6748..dba6629645b 100644
--- a/src/cloudflare/types/ruleset_create_params.py
+++ b/src/cloudflare/types/rulesets/ruleset_create_params.py
@@ -5,23 +5,21 @@
from typing import Union, Iterable
from typing_extensions import Literal, Required, TypedDict
-from .rulesets import (
- LogRuleParam,
- SkipRuleParam,
- BlockRuleParam,
- RouteRuleParam,
- ScoreRuleParam,
- ExecuteRuleParam,
- RewriteRuleParam,
- RedirectRuleParam,
- ChallengeRuleParam,
- SetConfigRuleParam,
- ServeErrorRuleParam,
- JSChallengeRuleParam,
- CompressResponseRuleParam,
- ManagedChallengeRuleParam,
- SetCacheSettingsRuleParam,
-)
+from .log_rule_param import LogRuleParam
+from .skip_rule_param import SkipRuleParam
+from .block_rule_param import BlockRuleParam
+from .route_rule_param import RouteRuleParam
+from .score_rule_param import ScoreRuleParam
+from .execute_rule_param import ExecuteRuleParam
+from .rewrite_rule_param import RewriteRuleParam
+from .redirect_rule_param import RedirectRuleParam
+from .challenge_rule_param import ChallengeRuleParam
+from .set_config_rule_param import SetConfigRuleParam
+from .serve_error_rule_param import ServeErrorRuleParam
+from .js_challenge_rule_param import JSChallengeRuleParam
+from .compress_response_rule_param import CompressResponseRuleParam
+from .managed_challenge_rule_param import ManagedChallengeRuleParam
+from .set_cache_settings_rule_param import SetCacheSettingsRuleParam
__all__ = ["RulesetCreateParams", "Rule"]
diff --git a/src/cloudflare/types/ruleset_create_response.py b/src/cloudflare/types/rulesets/ruleset_create_response.py
similarity index 74%
rename from src/cloudflare/types/ruleset_create_response.py
rename to src/cloudflare/types/rulesets/ruleset_create_response.py
index 5029d8a5350..a4cbefe983c 100644
--- a/src/cloudflare/types/ruleset_create_response.py
+++ b/src/cloudflare/types/rulesets/ruleset_create_response.py
@@ -4,24 +4,22 @@
from datetime import datetime
from typing_extensions import Literal
-from .._models import BaseModel
-from .rulesets import (
- LogRule,
- SkipRule,
- BlockRule,
- RouteRule,
- ScoreRule,
- ExecuteRule,
- RewriteRule,
- RedirectRule,
- ChallengeRule,
- SetConfigRule,
- ServeErrorRule,
- JSChallengeRule,
- CompressResponseRule,
- ManagedChallengeRule,
- SetCacheSettingsRule,
-)
+from .log_rule import LogRule
+from ..._models import BaseModel
+from .skip_rule import SkipRule
+from .block_rule import BlockRule
+from .route_rule import RouteRule
+from .score_rule import ScoreRule
+from .execute_rule import ExecuteRule
+from .rewrite_rule import RewriteRule
+from .redirect_rule import RedirectRule
+from .challenge_rule import ChallengeRule
+from .set_config_rule import SetConfigRule
+from .serve_error_rule import ServeErrorRule
+from .js_challenge_rule import JSChallengeRule
+from .compress_response_rule import CompressResponseRule
+from .managed_challenge_rule import ManagedChallengeRule
+from .set_cache_settings_rule import SetCacheSettingsRule
__all__ = ["RulesetCreateResponse", "Rule"]
diff --git a/src/cloudflare/types/ruleset_get_response.py b/src/cloudflare/types/rulesets/ruleset_get_response.py
similarity index 74%
rename from src/cloudflare/types/ruleset_get_response.py
rename to src/cloudflare/types/rulesets/ruleset_get_response.py
index 9ed60c97ee8..b4eeea24277 100644
--- a/src/cloudflare/types/ruleset_get_response.py
+++ b/src/cloudflare/types/rulesets/ruleset_get_response.py
@@ -4,24 +4,22 @@
from datetime import datetime
from typing_extensions import Literal
-from .._models import BaseModel
-from .rulesets import (
- LogRule,
- SkipRule,
- BlockRule,
- RouteRule,
- ScoreRule,
- ExecuteRule,
- RewriteRule,
- RedirectRule,
- ChallengeRule,
- SetConfigRule,
- ServeErrorRule,
- JSChallengeRule,
- CompressResponseRule,
- ManagedChallengeRule,
- SetCacheSettingsRule,
-)
+from .log_rule import LogRule
+from ..._models import BaseModel
+from .skip_rule import SkipRule
+from .block_rule import BlockRule
+from .route_rule import RouteRule
+from .score_rule import ScoreRule
+from .execute_rule import ExecuteRule
+from .rewrite_rule import RewriteRule
+from .redirect_rule import RedirectRule
+from .challenge_rule import ChallengeRule
+from .set_config_rule import SetConfigRule
+from .serve_error_rule import ServeErrorRule
+from .js_challenge_rule import JSChallengeRule
+from .compress_response_rule import CompressResponseRule
+from .managed_challenge_rule import ManagedChallengeRule
+from .set_cache_settings_rule import SetCacheSettingsRule
__all__ = ["RulesetGetResponse", "Rule"]
diff --git a/src/cloudflare/types/ruleset_update_params.py b/src/cloudflare/types/rulesets/ruleset_update_params.py
similarity index 72%
rename from src/cloudflare/types/ruleset_update_params.py
rename to src/cloudflare/types/rulesets/ruleset_update_params.py
index c737edfaf9e..328c7fbed0a 100644
--- a/src/cloudflare/types/ruleset_update_params.py
+++ b/src/cloudflare/types/rulesets/ruleset_update_params.py
@@ -5,23 +5,21 @@
from typing import Union, Iterable
from typing_extensions import Literal, Required, TypedDict
-from .rulesets import (
- LogRuleParam,
- SkipRuleParam,
- BlockRuleParam,
- RouteRuleParam,
- ScoreRuleParam,
- ExecuteRuleParam,
- RewriteRuleParam,
- RedirectRuleParam,
- ChallengeRuleParam,
- SetConfigRuleParam,
- ServeErrorRuleParam,
- JSChallengeRuleParam,
- CompressResponseRuleParam,
- ManagedChallengeRuleParam,
- SetCacheSettingsRuleParam,
-)
+from .log_rule_param import LogRuleParam
+from .skip_rule_param import SkipRuleParam
+from .block_rule_param import BlockRuleParam
+from .route_rule_param import RouteRuleParam
+from .score_rule_param import ScoreRuleParam
+from .execute_rule_param import ExecuteRuleParam
+from .rewrite_rule_param import RewriteRuleParam
+from .redirect_rule_param import RedirectRuleParam
+from .challenge_rule_param import ChallengeRuleParam
+from .set_config_rule_param import SetConfigRuleParam
+from .serve_error_rule_param import ServeErrorRuleParam
+from .js_challenge_rule_param import JSChallengeRuleParam
+from .compress_response_rule_param import CompressResponseRuleParam
+from .managed_challenge_rule_param import ManagedChallengeRuleParam
+from .set_cache_settings_rule_param import SetCacheSettingsRuleParam
__all__ = ["RulesetUpdateParams", "Rule"]
diff --git a/src/cloudflare/types/ruleset_update_response.py b/src/cloudflare/types/rulesets/ruleset_update_response.py
similarity index 74%
rename from src/cloudflare/types/ruleset_update_response.py
rename to src/cloudflare/types/rulesets/ruleset_update_response.py
index 1bac8b53486..7ed717a100d 100644
--- a/src/cloudflare/types/ruleset_update_response.py
+++ b/src/cloudflare/types/rulesets/ruleset_update_response.py
@@ -4,24 +4,22 @@
from datetime import datetime
from typing_extensions import Literal
-from .._models import BaseModel
-from .rulesets import (
- LogRule,
- SkipRule,
- BlockRule,
- RouteRule,
- ScoreRule,
- ExecuteRule,
- RewriteRule,
- RedirectRule,
- ChallengeRule,
- SetConfigRule,
- ServeErrorRule,
- JSChallengeRule,
- CompressResponseRule,
- ManagedChallengeRule,
- SetCacheSettingsRule,
-)
+from .log_rule import LogRule
+from ..._models import BaseModel
+from .skip_rule import SkipRule
+from .block_rule import BlockRule
+from .route_rule import RouteRule
+from .score_rule import ScoreRule
+from .execute_rule import ExecuteRule
+from .rewrite_rule import RewriteRule
+from .redirect_rule import RedirectRule
+from .challenge_rule import ChallengeRule
+from .set_config_rule import SetConfigRule
+from .serve_error_rule import ServeErrorRule
+from .js_challenge_rule import JSChallengeRule
+from .compress_response_rule import CompressResponseRule
+from .managed_challenge_rule import ManagedChallengeRule
+from .set_cache_settings_rule import SetCacheSettingsRule
__all__ = ["RulesetUpdateResponse", "Rule"]
diff --git a/src/cloudflare/types/snippets/__init__.py b/src/cloudflare/types/snippets/__init__.py
index 2cf9f9bde2d..2084aa6e7bb 100644
--- a/src/cloudflare/types/snippets/__init__.py
+++ b/src/cloudflare/types/snippets/__init__.py
@@ -2,6 +2,9 @@
from __future__ import annotations
+from .snippet import Snippet as Snippet
from .rule_list_response import RuleListResponse as RuleListResponse
from .rule_update_params import RuleUpdateParams as RuleUpdateParams
from .rule_update_response import RuleUpdateResponse as RuleUpdateResponse
+from .snippet_update_params import SnippetUpdateParams as SnippetUpdateParams
+from .snippet_delete_response import SnippetDeleteResponse as SnippetDeleteResponse
diff --git a/src/cloudflare/types/snippet.py b/src/cloudflare/types/snippets/snippet.py
similarity index 92%
rename from src/cloudflare/types/snippet.py
rename to src/cloudflare/types/snippets/snippet.py
index 140c3b0edea..69dc660896e 100644
--- a/src/cloudflare/types/snippet.py
+++ b/src/cloudflare/types/snippets/snippet.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["Snippet"]
diff --git a/src/cloudflare/types/snippet_delete_response.py b/src/cloudflare/types/snippets/snippet_delete_response.py
similarity index 100%
rename from src/cloudflare/types/snippet_delete_response.py
rename to src/cloudflare/types/snippets/snippet_delete_response.py
diff --git a/src/cloudflare/types/snippet_update_params.py b/src/cloudflare/types/snippets/snippet_update_params.py
similarity index 100%
rename from src/cloudflare/types/snippet_update_params.py
rename to src/cloudflare/types/snippets/snippet_update_params.py
diff --git a/src/cloudflare/types/spectrum/__init__.py b/src/cloudflare/types/spectrum/__init__.py
index 0dc9e6a6b7b..a0c9f08e48a 100644
--- a/src/cloudflare/types/spectrum/__init__.py
+++ b/src/cloudflare/types/spectrum/__init__.py
@@ -2,11 +2,19 @@
from __future__ import annotations
+from .dns import DNS as DNS
+from .edge_ips import EdgeIPs as EdgeIPs
+from .dns_param import DNSParam as DNSParam
+from .origin_dns import OriginDNS as OriginDNS
+from .origin_port import OriginPort as OriginPort
+from .edge_ips_param import EdgeIPsParam as EdgeIPsParam
from .app_list_params import AppListParams as AppListParams
from .app_get_response import AppGetResponse as AppGetResponse
+from .origin_dns_param import OriginDNSParam as OriginDNSParam
from .app_create_params import AppCreateParams as AppCreateParams
from .app_delete_params import AppDeleteParams as AppDeleteParams
from .app_update_params import AppUpdateParams as AppUpdateParams
+from .origin_port_param import OriginPortParam as OriginPortParam
from .app_create_response import AppCreateResponse as AppCreateResponse
from .app_delete_response import AppDeleteResponse as AppDeleteResponse
from .app_update_response import AppUpdateResponse as AppUpdateResponse
diff --git a/src/cloudflare/types/spectrum/app_create_params.py b/src/cloudflare/types/spectrum/app_create_params.py
index 876ec375f28..dbd9189a007 100644
--- a/src/cloudflare/types/spectrum/app_create_params.py
+++ b/src/cloudflare/types/spectrum/app_create_params.py
@@ -4,10 +4,10 @@
from typing_extensions import Literal, Required, TypedDict
-from ..dns_param import DNSParam
-from ..edge_ips_param import EdgeIPsParam
-from ..origin_dns_param import OriginDNSParam
-from ..origin_port_param import OriginPortParam
+from .dns_param import DNSParam
+from .edge_ips_param import EdgeIPsParam
+from .origin_dns_param import OriginDNSParam
+from .origin_port_param import OriginPortParam
__all__ = ["AppCreateParams"]
diff --git a/src/cloudflare/types/spectrum/app_create_response.py b/src/cloudflare/types/spectrum/app_create_response.py
index b9d057a8891..4b3530730e1 100644
--- a/src/cloudflare/types/spectrum/app_create_response.py
+++ b/src/cloudflare/types/spectrum/app_create_response.py
@@ -4,11 +4,11 @@
from datetime import datetime
from typing_extensions import Literal
-from ..dns import DNS
+from .dns import DNS
+from .edge_ips import EdgeIPs
from ..._models import BaseModel
-from ..edge_ips import EdgeIPs
-from ..origin_dns import OriginDNS
-from ..origin_port import OriginPort
+from .origin_dns import OriginDNS
+from .origin_port import OriginPort
__all__ = ["AppCreateResponse"]
diff --git a/src/cloudflare/types/spectrum/app_update_params.py b/src/cloudflare/types/spectrum/app_update_params.py
index ef1325a41f1..9a19d2453da 100644
--- a/src/cloudflare/types/spectrum/app_update_params.py
+++ b/src/cloudflare/types/spectrum/app_update_params.py
@@ -4,10 +4,10 @@
from typing_extensions import Literal, Required, TypedDict
-from ..dns_param import DNSParam
-from ..edge_ips_param import EdgeIPsParam
-from ..origin_dns_param import OriginDNSParam
-from ..origin_port_param import OriginPortParam
+from .dns_param import DNSParam
+from .edge_ips_param import EdgeIPsParam
+from .origin_dns_param import OriginDNSParam
+from .origin_port_param import OriginPortParam
__all__ = ["AppUpdateParams"]
diff --git a/src/cloudflare/types/spectrum/app_update_response.py b/src/cloudflare/types/spectrum/app_update_response.py
index 413fb2450b5..9f16609934f 100644
--- a/src/cloudflare/types/spectrum/app_update_response.py
+++ b/src/cloudflare/types/spectrum/app_update_response.py
@@ -4,11 +4,11 @@
from datetime import datetime
from typing_extensions import Literal
-from ..dns import DNS
+from .dns import DNS
+from .edge_ips import EdgeIPs
from ..._models import BaseModel
-from ..edge_ips import EdgeIPs
-from ..origin_dns import OriginDNS
-from ..origin_port import OriginPort
+from .origin_dns import OriginDNS
+from .origin_port import OriginPort
__all__ = ["AppUpdateResponse"]
diff --git a/src/cloudflare/types/dns.py b/src/cloudflare/types/spectrum/dns.py
similarity index 92%
rename from src/cloudflare/types/dns.py
rename to src/cloudflare/types/spectrum/dns.py
index 1c92ac31799..6b21157c6f6 100644
--- a/src/cloudflare/types/dns.py
+++ b/src/cloudflare/types/spectrum/dns.py
@@ -3,7 +3,7 @@
from typing import Optional
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["DNS"]
diff --git a/src/cloudflare/types/dns_param.py b/src/cloudflare/types/spectrum/dns_param.py
similarity index 100%
rename from src/cloudflare/types/dns_param.py
rename to src/cloudflare/types/spectrum/dns_param.py
diff --git a/src/cloudflare/types/edge_ips.py b/src/cloudflare/types/spectrum/edge_ips.py
similarity index 97%
rename from src/cloudflare/types/edge_ips.py
rename to src/cloudflare/types/spectrum/edge_ips.py
index d2d43ac7857..2b789322dfe 100644
--- a/src/cloudflare/types/edge_ips.py
+++ b/src/cloudflare/types/spectrum/edge_ips.py
@@ -3,7 +3,7 @@
from typing import List, Union, Optional
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["EdgeIPs", "EyeballIPs", "CustomerOwnedIPs"]
diff --git a/src/cloudflare/types/edge_ips_param.py b/src/cloudflare/types/spectrum/edge_ips_param.py
similarity index 100%
rename from src/cloudflare/types/edge_ips_param.py
rename to src/cloudflare/types/spectrum/edge_ips_param.py
diff --git a/src/cloudflare/types/origin_dns.py b/src/cloudflare/types/spectrum/origin_dns.py
similarity index 94%
rename from src/cloudflare/types/origin_dns.py
rename to src/cloudflare/types/spectrum/origin_dns.py
index 23bedbfd5c4..09bb671aef6 100644
--- a/src/cloudflare/types/origin_dns.py
+++ b/src/cloudflare/types/spectrum/origin_dns.py
@@ -3,7 +3,7 @@
from typing import Optional
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["OriginDNS"]
diff --git a/src/cloudflare/types/origin_dns_param.py b/src/cloudflare/types/spectrum/origin_dns_param.py
similarity index 100%
rename from src/cloudflare/types/origin_dns_param.py
rename to src/cloudflare/types/spectrum/origin_dns_param.py
diff --git a/src/cloudflare/types/origin_port.py b/src/cloudflare/types/spectrum/origin_port.py
similarity index 100%
rename from src/cloudflare/types/origin_port.py
rename to src/cloudflare/types/spectrum/origin_port.py
diff --git a/src/cloudflare/types/origin_port_param.py b/src/cloudflare/types/spectrum/origin_port_param.py
similarity index 100%
rename from src/cloudflare/types/origin_port_param.py
rename to src/cloudflare/types/spectrum/origin_port_param.py
diff --git a/src/cloudflare/types/speed/__init__.py b/src/cloudflare/types/speed/__init__.py
index 73ab8bfd4e3..4a31ccc0a91 100644
--- a/src/cloudflare/types/speed/__init__.py
+++ b/src/cloudflare/types/speed/__init__.py
@@ -3,14 +3,21 @@
from __future__ import annotations
from .test import Test as Test
+from .trend import Trend as Trend
from .schedule import Schedule as Schedule
from .availability import Availability as Availability
+from .labeled_region import LabeledRegion as LabeledRegion
from .schedule_param import ScheduleParam as ScheduleParam
from .test_list_params import TestListParams as TestListParams
+from .lighthouse_report import LighthouseReport as LighthouseReport
from .page_list_response import PageListResponse as PageListResponse
from .test_create_params import TestCreateParams as TestCreateParams
from .test_delete_params import TestDeleteParams as TestDeleteParams
from .test_list_response import TestListResponse as TestListResponse
+from .speed_delete_params import SpeedDeleteParams as SpeedDeleteParams
from .test_delete_response import TestDeleteResponse as TestDeleteResponse
+from .speed_delete_response import SpeedDeleteResponse as SpeedDeleteResponse
from .schedule_create_params import ScheduleCreateParams as ScheduleCreateParams
from .schedule_create_response import ScheduleCreateResponse as ScheduleCreateResponse
+from .speed_trends_list_params import SpeedTrendsListParams as SpeedTrendsListParams
+from .speed_schedule_get_params import SpeedScheduleGetParams as SpeedScheduleGetParams
diff --git a/src/cloudflare/types/speed/availability.py b/src/cloudflare/types/speed/availability.py
index 1ea04f635fd..96562a49349 100644
--- a/src/cloudflare/types/speed/availability.py
+++ b/src/cloudflare/types/speed/availability.py
@@ -5,7 +5,7 @@
from pydantic import Field as FieldInfo
from ..._models import BaseModel
-from ..labeled_region import LabeledRegion
+from .labeled_region import LabeledRegion
__all__ = ["Availability", "Quota"]
diff --git a/src/cloudflare/types/labeled_region.py b/src/cloudflare/types/speed/labeled_region.py
similarity index 96%
rename from src/cloudflare/types/labeled_region.py
rename to src/cloudflare/types/speed/labeled_region.py
index 158c5312587..a6d8ab6a7bd 100644
--- a/src/cloudflare/types/labeled_region.py
+++ b/src/cloudflare/types/speed/labeled_region.py
@@ -3,7 +3,7 @@
from typing import Optional
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["LabeledRegion"]
diff --git a/src/cloudflare/types/lighthouse_report.py b/src/cloudflare/types/speed/lighthouse_report.py
similarity index 98%
rename from src/cloudflare/types/lighthouse_report.py
rename to src/cloudflare/types/speed/lighthouse_report.py
index 94b739d7cfe..95948430129 100644
--- a/src/cloudflare/types/lighthouse_report.py
+++ b/src/cloudflare/types/speed/lighthouse_report.py
@@ -5,7 +5,7 @@
from pydantic import Field as FieldInfo
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["LighthouseReport", "Error"]
diff --git a/src/cloudflare/types/speed/page_list_response.py b/src/cloudflare/types/speed/page_list_response.py
index 627a6773f1c..e90c0dc3704 100644
--- a/src/cloudflare/types/speed/page_list_response.py
+++ b/src/cloudflare/types/speed/page_list_response.py
@@ -7,7 +7,7 @@
from .test import Test
from ..._models import BaseModel
-from ..labeled_region import LabeledRegion
+from .labeled_region import LabeledRegion
__all__ = ["PageListResponse"]
diff --git a/src/cloudflare/types/speed_delete_params.py b/src/cloudflare/types/speed/speed_delete_params.py
similarity index 100%
rename from src/cloudflare/types/speed_delete_params.py
rename to src/cloudflare/types/speed/speed_delete_params.py
diff --git a/src/cloudflare/types/speed_delete_response.py b/src/cloudflare/types/speed/speed_delete_response.py
similarity index 88%
rename from src/cloudflare/types/speed_delete_response.py
rename to src/cloudflare/types/speed/speed_delete_response.py
index ca2cd434822..71d39113616 100644
--- a/src/cloudflare/types/speed_delete_response.py
+++ b/src/cloudflare/types/speed/speed_delete_response.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["SpeedDeleteResponse"]
diff --git a/src/cloudflare/types/speed_schedule_get_params.py b/src/cloudflare/types/speed/speed_schedule_get_params.py
similarity index 100%
rename from src/cloudflare/types/speed_schedule_get_params.py
rename to src/cloudflare/types/speed/speed_schedule_get_params.py
diff --git a/src/cloudflare/types/speed_trends_list_params.py b/src/cloudflare/types/speed/speed_trends_list_params.py
similarity index 97%
rename from src/cloudflare/types/speed_trends_list_params.py
rename to src/cloudflare/types/speed/speed_trends_list_params.py
index 767e1d7de7b..2af594b00dc 100644
--- a/src/cloudflare/types/speed_trends_list_params.py
+++ b/src/cloudflare/types/speed/speed_trends_list_params.py
@@ -6,7 +6,7 @@
from datetime import datetime
from typing_extensions import Literal, Required, Annotated, TypedDict
-from .._utils import PropertyInfo
+from ..._utils import PropertyInfo
__all__ = ["SpeedTrendsListParams"]
diff --git a/src/cloudflare/types/speed/test.py b/src/cloudflare/types/speed/test.py
index 959dadbb56b..7bb5951eb72 100644
--- a/src/cloudflare/types/speed/test.py
+++ b/src/cloudflare/types/speed/test.py
@@ -7,8 +7,8 @@
from pydantic import Field as FieldInfo
from ..._models import BaseModel
-from ..labeled_region import LabeledRegion
-from ..lighthouse_report import LighthouseReport
+from .labeled_region import LabeledRegion
+from .lighthouse_report import LighthouseReport
__all__ = ["Test"]
diff --git a/src/cloudflare/types/trend.py b/src/cloudflare/types/speed/trend.py
similarity index 96%
rename from src/cloudflare/types/trend.py
rename to src/cloudflare/types/speed/trend.py
index d6aa839751f..713aecd2e80 100644
--- a/src/cloudflare/types/trend.py
+++ b/src/cloudflare/types/speed/trend.py
@@ -4,7 +4,7 @@
from pydantic import Field as FieldInfo
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["Trend"]
diff --git a/src/cloudflare/types/ssl/analyze_create_params.py b/src/cloudflare/types/ssl/analyze_create_params.py
index 284bd34587f..4f85cacffa1 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 ..bundle_method import BundleMethod
+from ..custom_hostnames import BundleMethod
__all__ = ["AnalyzeCreateParams"]
diff --git a/src/cloudflare/types/stream/__init__.py b/src/cloudflare/types/stream/__init__.py
index 23791af2545..1849a5f9203 100644
--- a/src/cloudflare/types/stream/__init__.py
+++ b/src/cloudflare/types/stream/__init__.py
@@ -5,18 +5,23 @@
from .clip import Clip as Clip
from .keys import Keys as Keys
from .audio import Audio as Audio
+from .video import Video as Video
from .caption import Caption as Caption
from .watermaks import Watermaks as Watermaks
from .live_input import LiveInput as LiveInput
+from .allowed_origins import AllowedOrigins as AllowedOrigins
from .key_get_response import KeyGetResponse as KeyGetResponse
from .key_create_params import KeyCreateParams as KeyCreateParams
from .key_delete_params import KeyDeleteParams as KeyDeleteParams
from .clip_create_params import ClipCreateParams as ClipCreateParams
from .copy_create_params import CopyCreateParams as CopyCreateParams
from .embed_get_response import EmbedGetResponse as EmbedGetResponse
+from .stream_list_params import StreamListParams as StreamListParams
from .key_delete_response import KeyDeleteResponse as KeyDeleteResponse
from .token_create_params import TokenCreateParams as TokenCreateParams
from .caption_get_response import CaptionGetResponse as CaptionGetResponse
+from .stream_create_params import StreamCreateParams as StreamCreateParams
+from .stream_delete_params import StreamDeleteParams as StreamDeleteParams
from .webhook_get_response import WebhookGetResponse as WebhookGetResponse
from .caption_delete_params import CaptionDeleteParams as CaptionDeleteParams
from .caption_update_params import CaptionUpdateParams as CaptionUpdateParams
diff --git a/src/cloudflare/types/allowed_origins.py b/src/cloudflare/types/stream/allowed_origins.py
similarity index 100%
rename from src/cloudflare/types/allowed_origins.py
rename to src/cloudflare/types/stream/allowed_origins.py
diff --git a/src/cloudflare/types/stream/clip.py b/src/cloudflare/types/stream/clip.py
index 72a56372a76..9c6197aec52 100644
--- a/src/cloudflare/types/stream/clip.py
+++ b/src/cloudflare/types/stream/clip.py
@@ -7,7 +7,7 @@
from pydantic import Field as FieldInfo
from ..._models import BaseModel
-from ..allowed_origins import AllowedOrigins
+from .allowed_origins import AllowedOrigins
__all__ = ["Clip", "Playback", "Watermark"]
diff --git a/src/cloudflare/types/stream/clip_create_params.py b/src/cloudflare/types/stream/clip_create_params.py
index 3c39f3ee70e..b3a5e5d5526 100644
--- a/src/cloudflare/types/stream/clip_create_params.py
+++ b/src/cloudflare/types/stream/clip_create_params.py
@@ -6,7 +6,7 @@
from typing_extensions import Required, Annotated, TypedDict
from ..._utils import PropertyInfo
-from ..allowed_origins import AllowedOrigins
+from .allowed_origins import AllowedOrigins
__all__ = ["ClipCreateParams", "Watermark"]
diff --git a/src/cloudflare/types/stream/copy_create_params.py b/src/cloudflare/types/stream/copy_create_params.py
index 97fe1539146..7049042d564 100644
--- a/src/cloudflare/types/stream/copy_create_params.py
+++ b/src/cloudflare/types/stream/copy_create_params.py
@@ -7,7 +7,7 @@
from typing_extensions import Required, Annotated, TypedDict
from ..._utils import PropertyInfo
-from ..allowed_origins import AllowedOrigins
+from .allowed_origins import AllowedOrigins
__all__ = ["CopyCreateParams", "Watermark"]
diff --git a/src/cloudflare/types/stream/direct_upload_create_params.py b/src/cloudflare/types/stream/direct_upload_create_params.py
index 1e02931e73f..6689ff92e37 100644
--- a/src/cloudflare/types/stream/direct_upload_create_params.py
+++ b/src/cloudflare/types/stream/direct_upload_create_params.py
@@ -7,7 +7,7 @@
from typing_extensions import Required, Annotated, TypedDict
from ..._utils import PropertyInfo
-from ..allowed_origins import AllowedOrigins
+from .allowed_origins import AllowedOrigins
__all__ = ["DirectUploadCreateParams", "Watermark"]
diff --git a/src/cloudflare/types/stream_create_params.py b/src/cloudflare/types/stream/stream_create_params.py
similarity index 100%
rename from src/cloudflare/types/stream_create_params.py
rename to src/cloudflare/types/stream/stream_create_params.py
diff --git a/src/cloudflare/types/stream_delete_params.py b/src/cloudflare/types/stream/stream_delete_params.py
similarity index 100%
rename from src/cloudflare/types/stream_delete_params.py
rename to src/cloudflare/types/stream/stream_delete_params.py
diff --git a/src/cloudflare/types/stream_list_params.py b/src/cloudflare/types/stream/stream_list_params.py
similarity index 97%
rename from src/cloudflare/types/stream_list_params.py
rename to src/cloudflare/types/stream/stream_list_params.py
index f41f20ba174..5d9ed520774 100644
--- a/src/cloudflare/types/stream_list_params.py
+++ b/src/cloudflare/types/stream/stream_list_params.py
@@ -6,7 +6,7 @@
from datetime import datetime
from typing_extensions import Literal, Required, Annotated, TypedDict
-from .._utils import PropertyInfo
+from ..._utils import PropertyInfo
__all__ = ["StreamListParams"]
diff --git a/src/cloudflare/types/video.py b/src/cloudflare/types/stream/video.py
similarity index 98%
rename from src/cloudflare/types/video.py
rename to src/cloudflare/types/stream/video.py
index ac4559000ca..dedd298f21b 100644
--- a/src/cloudflare/types/video.py
+++ b/src/cloudflare/types/stream/video.py
@@ -6,8 +6,8 @@
from pydantic import Field as FieldInfo
-from .stream import Watermaks
-from .._models import BaseModel
+from ..._models import BaseModel
+from .watermaks import Watermaks
from .allowed_origins import AllowedOrigins
__all__ = ["Video", "Input", "Playback", "Status"]
diff --git a/src/cloudflare/types/subscriptions/__init__.py b/src/cloudflare/types/subscriptions/__init__.py
new file mode 100644
index 00000000000..662a2dae32c
--- /dev/null
+++ b/src/cloudflare/types/subscriptions/__init__.py
@@ -0,0 +1,11 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .subscription_get_response import SubscriptionGetResponse as SubscriptionGetResponse
+from .subscription_create_params import SubscriptionCreateParams as SubscriptionCreateParams
+from .subscription_delete_params import SubscriptionDeleteParams as SubscriptionDeleteParams
+from .subscription_update_params import SubscriptionUpdateParams as SubscriptionUpdateParams
+from .subscription_create_response import SubscriptionCreateResponse as SubscriptionCreateResponse
+from .subscription_delete_response import SubscriptionDeleteResponse as SubscriptionDeleteResponse
+from .subscription_update_response import SubscriptionUpdateResponse as SubscriptionUpdateResponse
diff --git a/src/cloudflare/types/subscription_create_params.py b/src/cloudflare/types/subscriptions/subscription_create_params.py
similarity index 90%
rename from src/cloudflare/types/subscription_create_params.py
rename to src/cloudflare/types/subscriptions/subscription_create_params.py
index 49e4f424768..1d2b9b5dbb0 100644
--- a/src/cloudflare/types/subscription_create_params.py
+++ b/src/cloudflare/types/subscriptions/subscription_create_params.py
@@ -5,7 +5,7 @@
from typing import Iterable
from typing_extensions import Literal, TypedDict
-from .user import RatePlanParam, SubscriptionZoneParam, SubscriptionComponentParam
+from ..user import RatePlanParam, SubscriptionZoneParam, SubscriptionComponentParam
__all__ = ["SubscriptionCreateParams", "App"]
diff --git a/src/cloudflare/types/subscription_create_response.py b/src/cloudflare/types/subscriptions/subscription_create_response.py
similarity index 100%
rename from src/cloudflare/types/subscription_create_response.py
rename to src/cloudflare/types/subscriptions/subscription_create_response.py
diff --git a/src/cloudflare/types/subscription_delete_params.py b/src/cloudflare/types/subscriptions/subscription_delete_params.py
similarity index 100%
rename from src/cloudflare/types/subscription_delete_params.py
rename to src/cloudflare/types/subscriptions/subscription_delete_params.py
diff --git a/src/cloudflare/types/subscription_delete_response.py b/src/cloudflare/types/subscriptions/subscription_delete_response.py
similarity index 89%
rename from src/cloudflare/types/subscription_delete_response.py
rename to src/cloudflare/types/subscriptions/subscription_delete_response.py
index ce2b575d64b..9afa5116dc3 100644
--- a/src/cloudflare/types/subscription_delete_response.py
+++ b/src/cloudflare/types/subscriptions/subscription_delete_response.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["SubscriptionDeleteResponse"]
diff --git a/src/cloudflare/types/subscription_get_response.py b/src/cloudflare/types/subscriptions/subscription_get_response.py
similarity index 100%
rename from src/cloudflare/types/subscription_get_response.py
rename to src/cloudflare/types/subscriptions/subscription_get_response.py
diff --git a/src/cloudflare/types/subscription_update_params.py b/src/cloudflare/types/subscriptions/subscription_update_params.py
similarity index 91%
rename from src/cloudflare/types/subscription_update_params.py
rename to src/cloudflare/types/subscriptions/subscription_update_params.py
index fc8d51ff7ba..1acb3f961e5 100644
--- a/src/cloudflare/types/subscription_update_params.py
+++ b/src/cloudflare/types/subscriptions/subscription_update_params.py
@@ -5,7 +5,7 @@
from typing import Iterable
from typing_extensions import Literal, Required, TypedDict
-from .user import RatePlanParam, SubscriptionZoneParam, SubscriptionComponentParam
+from ..user import RatePlanParam, SubscriptionZoneParam, SubscriptionComponentParam
__all__ = ["SubscriptionUpdateParams", "App"]
diff --git a/src/cloudflare/types/subscription_update_response.py b/src/cloudflare/types/subscriptions/subscription_update_response.py
similarity index 100%
rename from src/cloudflare/types/subscription_update_response.py
rename to src/cloudflare/types/subscriptions/subscription_update_response.py
diff --git a/src/cloudflare/types/url_normalization/__init__.py b/src/cloudflare/types/url_normalization/__init__.py
new file mode 100644
index 00000000000..6016d4f7824
--- /dev/null
+++ b/src/cloudflare/types/url_normalization/__init__.py
@@ -0,0 +1,7 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .url_normalization_get_response import URLNormalizationGetResponse as URLNormalizationGetResponse
+from .url_normalization_update_params import URLNormalizationUpdateParams as URLNormalizationUpdateParams
+from .url_normalization_update_response import URLNormalizationUpdateResponse as URLNormalizationUpdateResponse
diff --git a/src/cloudflare/types/url_normalization_get_response.py b/src/cloudflare/types/url_normalization/url_normalization_get_response.py
similarity index 92%
rename from src/cloudflare/types/url_normalization_get_response.py
rename to src/cloudflare/types/url_normalization/url_normalization_get_response.py
index 883506990f2..0bebaa4413c 100644
--- a/src/cloudflare/types/url_normalization_get_response.py
+++ b/src/cloudflare/types/url_normalization/url_normalization_get_response.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["URLNormalizationGetResponse"]
diff --git a/src/cloudflare/types/url_normalization_update_params.py b/src/cloudflare/types/url_normalization/url_normalization_update_params.py
similarity index 100%
rename from src/cloudflare/types/url_normalization_update_params.py
rename to src/cloudflare/types/url_normalization/url_normalization_update_params.py
diff --git a/src/cloudflare/types/url_normalization_update_response.py b/src/cloudflare/types/url_normalization/url_normalization_update_response.py
similarity index 92%
rename from src/cloudflare/types/url_normalization_update_response.py
rename to src/cloudflare/types/url_normalization/url_normalization_update_response.py
index a3f68fe45fb..b7d70096ced 100644
--- a/src/cloudflare/types/url_normalization_update_response.py
+++ b/src/cloudflare/types/url_normalization/url_normalization_update_response.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["URLNormalizationUpdateResponse"]
diff --git a/src/cloudflare/types/url_scanner/__init__.py b/src/cloudflare/types/url_scanner/__init__.py
index cb5bc10280d..dc7c82ec8f9 100644
--- a/src/cloudflare/types/url_scanner/__init__.py
+++ b/src/cloudflare/types/url_scanner/__init__.py
@@ -8,3 +8,5 @@
from .url_scanner_domain import URLScannerDomain as URLScannerDomain
from .scan_create_response import ScanCreateResponse as ScanCreateResponse
from .scan_screenshot_params import ScanScreenshotParams as ScanScreenshotParams
+from .url_scanner_scan_params import URLScannerScanParams as URLScannerScanParams
+from .url_scanner_scan_response import URLScannerScanResponse as URLScannerScanResponse
diff --git a/src/cloudflare/types/url_scanner_scan_params.py b/src/cloudflare/types/url_scanner/url_scanner_scan_params.py
similarity index 98%
rename from src/cloudflare/types/url_scanner_scan_params.py
rename to src/cloudflare/types/url_scanner/url_scanner_scan_params.py
index 6fe41f6372a..3c7a9527f47 100644
--- a/src/cloudflare/types/url_scanner_scan_params.py
+++ b/src/cloudflare/types/url_scanner/url_scanner_scan_params.py
@@ -6,7 +6,7 @@
from datetime import datetime
from typing_extensions import Annotated, TypedDict
-from .._utils import PropertyInfo
+from ..._utils import PropertyInfo
__all__ = ["URLScannerScanParams"]
diff --git a/src/cloudflare/types/url_scanner_scan_response.py b/src/cloudflare/types/url_scanner/url_scanner_scan_response.py
similarity index 94%
rename from src/cloudflare/types/url_scanner_scan_response.py
rename to src/cloudflare/types/url_scanner/url_scanner_scan_response.py
index 6d2c2bedc94..cf576f43774 100644
--- a/src/cloudflare/types/url_scanner_scan_response.py
+++ b/src/cloudflare/types/url_scanner/url_scanner_scan_response.py
@@ -3,7 +3,7 @@
from typing import List
from datetime import datetime
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["URLScannerScanResponse", "Task"]
diff --git a/src/cloudflare/types/user/__init__.py b/src/cloudflare/types/user/__init__.py
index 5cf8009e08a..357891efc5e 100644
--- a/src/cloudflare/types/user/__init__.py
+++ b/src/cloudflare/types/user/__init__.py
@@ -10,10 +10,13 @@
from .policy_param import PolicyParam as PolicyParam
from .subscription import Subscription as Subscription
from .rate_plan_param import RatePlanParam as RatePlanParam
+from .user_edit_params import UserEditParams as UserEditParams
from .subscription_zone import SubscriptionZone as SubscriptionZone
from .token_list_params import TokenListParams as TokenListParams
+from .user_get_response import UserGetResponse as UserGetResponse
from .invite_edit_params import InviteEditParams as InviteEditParams
from .token_get_response import TokenGetResponse as TokenGetResponse
+from .user_edit_response import UserEditResponse as UserEditResponse
from .invite_get_response import InviteGetResponse as InviteGetResponse
from .token_create_params import TokenCreateParams as TokenCreateParams
from .token_delete_params import TokenDeleteParams as TokenDeleteParams
diff --git a/src/cloudflare/types/user_edit_params.py b/src/cloudflare/types/user/user_edit_params.py
similarity index 100%
rename from src/cloudflare/types/user_edit_params.py
rename to src/cloudflare/types/user/user_edit_params.py
diff --git a/src/cloudflare/types/user_edit_response.py b/src/cloudflare/types/user/user_edit_response.py
similarity index 100%
rename from src/cloudflare/types/user_edit_response.py
rename to src/cloudflare/types/user/user_edit_response.py
diff --git a/src/cloudflare/types/user_get_response.py b/src/cloudflare/types/user/user_get_response.py
similarity index 100%
rename from src/cloudflare/types/user_get_response.py
rename to src/cloudflare/types/user/user_get_response.py
diff --git a/src/cloudflare/types/waiting_rooms/__init__.py b/src/cloudflare/types/waiting_rooms/__init__.py
index 0ada620a2af..28092b72bf5 100644
--- a/src/cloudflare/types/waiting_rooms/__init__.py
+++ b/src/cloudflare/types/waiting_rooms/__init__.py
@@ -4,7 +4,10 @@
from .event import Event as Event
from .setting import Setting as Setting
+from .waiting_room import WaitingRoom as WaitingRoom
from .rule_edit_params import RuleEditParams as RuleEditParams
+from .additional_routes import AdditionalRoutes as AdditionalRoutes
+from .cookie_attributes import CookieAttributes as CookieAttributes
from .event_edit_params import EventEditParams as EventEditParams
from .event_list_params import EventListParams as EventListParams
from .waiting_room_rule import WaitingRoomRule as WaitingRoomRule
@@ -26,4 +29,12 @@
from .page_preview_response import PagePreviewResponse as PagePreviewResponse
from .setting_edit_response import SettingEditResponse as SettingEditResponse
from .setting_update_params import SettingUpdateParams as SettingUpdateParams
+from .additional_routes_param import AdditionalRoutesParam as AdditionalRoutesParam
+from .cookie_attributes_param import CookieAttributesParam as CookieAttributesParam
from .setting_update_response import SettingUpdateResponse as SettingUpdateResponse
+from .waiting_room_edit_params import WaitingRoomEditParams as WaitingRoomEditParams
+from .waiting_room_list_params import WaitingRoomListParams as WaitingRoomListParams
+from .waiting_room_create_params import WaitingRoomCreateParams as WaitingRoomCreateParams
+from .waiting_room_delete_params import WaitingRoomDeleteParams as WaitingRoomDeleteParams
+from .waiting_room_update_params import WaitingRoomUpdateParams as WaitingRoomUpdateParams
+from .waiting_room_delete_response import WaitingRoomDeleteResponse as WaitingRoomDeleteResponse
diff --git a/src/cloudflare/types/additional_routes.py b/src/cloudflare/types/waiting_rooms/additional_routes.py
similarity index 96%
rename from src/cloudflare/types/additional_routes.py
rename to src/cloudflare/types/waiting_rooms/additional_routes.py
index f8a1decaed7..5f3d576b32c 100644
--- a/src/cloudflare/types/additional_routes.py
+++ b/src/cloudflare/types/waiting_rooms/additional_routes.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["AdditionalRoutes"]
diff --git a/src/cloudflare/types/additional_routes_param.py b/src/cloudflare/types/waiting_rooms/additional_routes_param.py
similarity index 100%
rename from src/cloudflare/types/additional_routes_param.py
rename to src/cloudflare/types/waiting_rooms/additional_routes_param.py
diff --git a/src/cloudflare/types/cookie_attributes.py b/src/cloudflare/types/waiting_rooms/cookie_attributes.py
similarity index 96%
rename from src/cloudflare/types/cookie_attributes.py
rename to src/cloudflare/types/waiting_rooms/cookie_attributes.py
index 6145990f7c1..d757eb26275 100644
--- a/src/cloudflare/types/cookie_attributes.py
+++ b/src/cloudflare/types/waiting_rooms/cookie_attributes.py
@@ -3,7 +3,7 @@
from typing import Optional
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["CookieAttributes"]
diff --git a/src/cloudflare/types/cookie_attributes_param.py b/src/cloudflare/types/waiting_rooms/cookie_attributes_param.py
similarity index 100%
rename from src/cloudflare/types/cookie_attributes_param.py
rename to src/cloudflare/types/waiting_rooms/cookie_attributes_param.py
diff --git a/src/cloudflare/types/waiting_room.py b/src/cloudflare/types/waiting_rooms/waiting_room.py
similarity index 99%
rename from src/cloudflare/types/waiting_room.py
rename to src/cloudflare/types/waiting_rooms/waiting_room.py
index 80b241aba67..e78da6a6efc 100644
--- a/src/cloudflare/types/waiting_room.py
+++ b/src/cloudflare/types/waiting_rooms/waiting_room.py
@@ -4,7 +4,7 @@
from datetime import datetime
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
from .additional_routes import AdditionalRoutes
from .cookie_attributes import CookieAttributes
diff --git a/src/cloudflare/types/waiting_room_create_params.py b/src/cloudflare/types/waiting_rooms/waiting_room_create_params.py
similarity index 100%
rename from src/cloudflare/types/waiting_room_create_params.py
rename to src/cloudflare/types/waiting_rooms/waiting_room_create_params.py
diff --git a/src/cloudflare/types/waiting_room_delete_params.py b/src/cloudflare/types/waiting_rooms/waiting_room_delete_params.py
similarity index 100%
rename from src/cloudflare/types/waiting_room_delete_params.py
rename to src/cloudflare/types/waiting_rooms/waiting_room_delete_params.py
diff --git a/src/cloudflare/types/waiting_room_delete_response.py b/src/cloudflare/types/waiting_rooms/waiting_room_delete_response.py
similarity index 87%
rename from src/cloudflare/types/waiting_room_delete_response.py
rename to src/cloudflare/types/waiting_rooms/waiting_room_delete_response.py
index 75446852d17..9ae3650b77d 100644
--- a/src/cloudflare/types/waiting_room_delete_response.py
+++ b/src/cloudflare/types/waiting_rooms/waiting_room_delete_response.py
@@ -2,7 +2,7 @@
from typing import Optional
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["WaitingRoomDeleteResponse"]
diff --git a/src/cloudflare/types/waiting_room_edit_params.py b/src/cloudflare/types/waiting_rooms/waiting_room_edit_params.py
similarity index 100%
rename from src/cloudflare/types/waiting_room_edit_params.py
rename to src/cloudflare/types/waiting_rooms/waiting_room_edit_params.py
diff --git a/src/cloudflare/types/waiting_room_list_params.py b/src/cloudflare/types/waiting_rooms/waiting_room_list_params.py
similarity index 100%
rename from src/cloudflare/types/waiting_room_list_params.py
rename to src/cloudflare/types/waiting_rooms/waiting_room_list_params.py
diff --git a/src/cloudflare/types/waiting_room_update_params.py b/src/cloudflare/types/waiting_rooms/waiting_room_update_params.py
similarity index 100%
rename from src/cloudflare/types/waiting_room_update_params.py
rename to src/cloudflare/types/waiting_rooms/waiting_room_update_params.py
diff --git a/src/cloudflare/types/warp_connector/__init__.py b/src/cloudflare/types/warp_connector/__init__.py
new file mode 100644
index 00000000000..9fbbe448c87
--- /dev/null
+++ b/src/cloudflare/types/warp_connector/__init__.py
@@ -0,0 +1,14 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from .warp_connector_edit_params import WARPConnectorEditParams as WARPConnectorEditParams
+from .warp_connector_list_params import WARPConnectorListParams as WARPConnectorListParams
+from .warp_connector_get_response import WARPConnectorGetResponse as WARPConnectorGetResponse
+from .warp_connector_create_params import WARPConnectorCreateParams as WARPConnectorCreateParams
+from .warp_connector_delete_params import WARPConnectorDeleteParams as WARPConnectorDeleteParams
+from .warp_connector_edit_response import WARPConnectorEditResponse as WARPConnectorEditResponse
+from .warp_connector_list_response import WARPConnectorListResponse as WARPConnectorListResponse
+from .warp_connector_token_response import WARPConnectorTokenResponse as WARPConnectorTokenResponse
+from .warp_connector_create_response import WARPConnectorCreateResponse as WARPConnectorCreateResponse
+from .warp_connector_delete_response import WARPConnectorDeleteResponse as WARPConnectorDeleteResponse
diff --git a/src/cloudflare/types/warp_connector_create_params.py b/src/cloudflare/types/warp_connector/warp_connector_create_params.py
similarity index 100%
rename from src/cloudflare/types/warp_connector_create_params.py
rename to src/cloudflare/types/warp_connector/warp_connector_create_params.py
diff --git a/src/cloudflare/types/warp_connector_create_response.py b/src/cloudflare/types/warp_connector/warp_connector_create_response.py
similarity index 97%
rename from src/cloudflare/types/warp_connector_create_response.py
rename to src/cloudflare/types/warp_connector/warp_connector_create_response.py
index ac7ea82fcc6..ef3af32565c 100644
--- a/src/cloudflare/types/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 import CloudflareTunnel
+from ..._models import BaseModel
__all__ = ["WARPConnectorCreateResponse", "TunnelWARPConnectorTunnel", "TunnelWARPConnectorTunnelConnection"]
diff --git a/src/cloudflare/types/warp_connector_delete_params.py b/src/cloudflare/types/warp_connector/warp_connector_delete_params.py
similarity index 100%
rename from src/cloudflare/types/warp_connector_delete_params.py
rename to src/cloudflare/types/warp_connector/warp_connector_delete_params.py
diff --git a/src/cloudflare/types/warp_connector_delete_response.py b/src/cloudflare/types/warp_connector/warp_connector_delete_response.py
similarity index 97%
rename from src/cloudflare/types/warp_connector_delete_response.py
rename to src/cloudflare/types/warp_connector/warp_connector_delete_response.py
index 2c2498143b1..1f059abb987 100644
--- a/src/cloudflare/types/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 import CloudflareTunnel
+from ..._models import BaseModel
__all__ = ["WARPConnectorDeleteResponse", "TunnelWARPConnectorTunnel", "TunnelWARPConnectorTunnelConnection"]
diff --git a/src/cloudflare/types/warp_connector_edit_params.py b/src/cloudflare/types/warp_connector/warp_connector_edit_params.py
similarity index 100%
rename from src/cloudflare/types/warp_connector_edit_params.py
rename to src/cloudflare/types/warp_connector/warp_connector_edit_params.py
diff --git a/src/cloudflare/types/warp_connector_edit_response.py b/src/cloudflare/types/warp_connector/warp_connector_edit_response.py
similarity index 97%
rename from src/cloudflare/types/warp_connector_edit_response.py
rename to src/cloudflare/types/warp_connector/warp_connector_edit_response.py
index 048c254ea94..17b39aa461d 100644
--- a/src/cloudflare/types/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 import CloudflareTunnel
+from ..._models import BaseModel
__all__ = ["WARPConnectorEditResponse", "TunnelWARPConnectorTunnel", "TunnelWARPConnectorTunnelConnection"]
diff --git a/src/cloudflare/types/warp_connector_get_response.py b/src/cloudflare/types/warp_connector/warp_connector_get_response.py
similarity index 97%
rename from src/cloudflare/types/warp_connector_get_response.py
rename to src/cloudflare/types/warp_connector/warp_connector_get_response.py
index 087bbbbf160..77f9eb18a4c 100644
--- a/src/cloudflare/types/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 import CloudflareTunnel
+from ..._models import BaseModel
__all__ = ["WARPConnectorGetResponse", "TunnelWARPConnectorTunnel", "TunnelWARPConnectorTunnelConnection"]
diff --git a/src/cloudflare/types/warp_connector_list_params.py b/src/cloudflare/types/warp_connector/warp_connector_list_params.py
similarity index 97%
rename from src/cloudflare/types/warp_connector_list_params.py
rename to src/cloudflare/types/warp_connector/warp_connector_list_params.py
index fe6b95c78ae..e58a6e75cc1 100644
--- a/src/cloudflare/types/warp_connector_list_params.py
+++ b/src/cloudflare/types/warp_connector/warp_connector_list_params.py
@@ -6,7 +6,7 @@
from datetime import datetime
from typing_extensions import Required, Annotated, TypedDict
-from .._utils import PropertyInfo
+from ..._utils import PropertyInfo
__all__ = ["WARPConnectorListParams"]
diff --git a/src/cloudflare/types/warp_connector_list_response.py b/src/cloudflare/types/warp_connector/warp_connector_list_response.py
similarity index 97%
rename from src/cloudflare/types/warp_connector_list_response.py
rename to src/cloudflare/types/warp_connector/warp_connector_list_response.py
index 0da244e276d..303c631c0fd 100644
--- a/src/cloudflare/types/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 import CloudflareTunnel
+from ..._models import BaseModel
__all__ = ["WARPConnectorListResponse", "TunnelWARPConnectorTunnel", "TunnelWARPConnectorTunnelConnection"]
diff --git a/src/cloudflare/types/warp_connector_token_response.py b/src/cloudflare/types/warp_connector/warp_connector_token_response.py
similarity index 100%
rename from src/cloudflare/types/warp_connector_token_response.py
rename to src/cloudflare/types/warp_connector/warp_connector_token_response.py
diff --git a/src/cloudflare/types/workers/__init__.py b/src/cloudflare/types/workers/__init__.py
index d966f906713..0a1b7dabef1 100644
--- a/src/cloudflare/types/workers/__init__.py
+++ b/src/cloudflare/types/workers/__init__.py
@@ -4,17 +4,42 @@
from .domain import Domain as Domain
from .script import Script as Script
+from .binding import Binding as Binding
+from .d1_binding import D1Binding as D1Binding
+from .r2_binding import R2Binding as R2Binding
from .ai_run_params import AIRunParams as AIRunParams
+from .binding_param import BindingParam as BindingParam
+from .migration_step import MigrationStep as MigrationStep
from .script_setting import ScriptSetting as ScriptSetting
from .ai_run_response import AIRunResponse as AIRunResponse
+from .service_binding import ServiceBinding as ServiceBinding
+from .d1_binding_param import D1BindingParam as D1BindingParam
+from .r2_binding_param import R2BindingParam as R2BindingParam
+from .mtls_cert_binding import MTLSCERTBinding as MTLSCERTBinding
+from .stepped_migration import SteppedMigration as SteppedMigration
from .domain_list_params import DomainListParams as DomainListParams
from .domain_delete_params import DomainDeleteParams as DomainDeleteParams
from .domain_update_params import DomainUpdateParams as DomainUpdateParams
+from .kv_namespace_binding import KVNamespaceBinding as KVNamespaceBinding
+from .migration_step_param import MigrationStepParam as MigrationStepParam
from .script_delete_params import ScriptDeleteParams as ScriptDeleteParams
from .script_update_params import ScriptUpdateParams as ScriptUpdateParams
+from .service_binding_param import ServiceBindingParam as ServiceBindingParam
+from .single_step_migration import SingleStepMigration as SingleStepMigration
+from .worker_metadata_param import WorkerMetadataParam as WorkerMetadataParam
+from .durable_object_binding import DurableObjectBinding as DurableObjectBinding
from .subdomain_get_response import SubdomainGetResponse as SubdomainGetResponse
+from .mtls_cert_binding_param import MTLSCERTBindingParam as MTLSCERTBindingParam
+from .placement_configuration import PlacementConfiguration as PlacementConfiguration
+from .stepped_migration_param import SteppedMigrationParam as SteppedMigrationParam
from .subdomain_update_params import SubdomainUpdateParams as SubdomainUpdateParams
from .subdomain_update_response import SubdomainUpdateResponse as SubdomainUpdateResponse
+from .dispatch_namespace_binding import DispatchNamespaceBinding as DispatchNamespaceBinding
+from .kv_namespace_binding_param import KVNamespaceBindingParam as KVNamespaceBindingParam
+from .single_step_migration_param import SingleStepMigrationParam as SingleStepMigrationParam
from .account_setting_get_response import AccountSettingGetResponse as AccountSettingGetResponse
+from .durable_object_binding_param import DurableObjectBindingParam as DurableObjectBindingParam
from .account_setting_update_params import AccountSettingUpdateParams as AccountSettingUpdateParams
+from .placement_configuration_param import PlacementConfigurationParam as PlacementConfigurationParam
from .account_setting_update_response import AccountSettingUpdateResponse as AccountSettingUpdateResponse
+from .dispatch_namespace_binding_param import DispatchNamespaceBindingParam as DispatchNamespaceBindingParam
diff --git a/src/cloudflare/types/binding.py b/src/cloudflare/types/workers/binding.py
similarity index 96%
rename from src/cloudflare/types/binding.py
rename to src/cloudflare/types/workers/binding.py
index 6e36418fde3..e2bf21c1be4 100644
--- a/src/cloudflare/types/binding.py
+++ b/src/cloudflare/types/workers/binding.py
@@ -3,7 +3,7 @@
from typing import Union
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
from .d1_binding import D1Binding
from .r2_binding import R2Binding
from .service_binding import ServiceBinding
diff --git a/src/cloudflare/types/binding_param.py b/src/cloudflare/types/workers/binding_param.py
similarity index 100%
rename from src/cloudflare/types/binding_param.py
rename to src/cloudflare/types/workers/binding_param.py
diff --git a/src/cloudflare/types/d1_binding.py b/src/cloudflare/types/workers/d1_binding.py
similarity index 93%
rename from src/cloudflare/types/d1_binding.py
rename to src/cloudflare/types/workers/d1_binding.py
index a72f11c25b4..7010fcfa068 100644
--- a/src/cloudflare/types/d1_binding.py
+++ b/src/cloudflare/types/workers/d1_binding.py
@@ -2,7 +2,7 @@
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["D1Binding"]
diff --git a/src/cloudflare/types/d1_binding_param.py b/src/cloudflare/types/workers/d1_binding_param.py
similarity index 100%
rename from src/cloudflare/types/d1_binding_param.py
rename to src/cloudflare/types/workers/d1_binding_param.py
diff --git a/src/cloudflare/types/dispatch_namespace_binding.py b/src/cloudflare/types/workers/dispatch_namespace_binding.py
similarity index 96%
rename from src/cloudflare/types/dispatch_namespace_binding.py
rename to src/cloudflare/types/workers/dispatch_namespace_binding.py
index 30a308cb0f8..7211e0a0dbb 100644
--- a/src/cloudflare/types/dispatch_namespace_binding.py
+++ b/src/cloudflare/types/workers/dispatch_namespace_binding.py
@@ -3,7 +3,7 @@
from typing import List, Optional
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["DispatchNamespaceBinding", "Outbound", "OutboundWorker"]
diff --git a/src/cloudflare/types/dispatch_namespace_binding_param.py b/src/cloudflare/types/workers/dispatch_namespace_binding_param.py
similarity index 100%
rename from src/cloudflare/types/dispatch_namespace_binding_param.py
rename to src/cloudflare/types/workers/dispatch_namespace_binding_param.py
diff --git a/src/cloudflare/types/durable_object_binding.py b/src/cloudflare/types/workers/durable_object_binding.py
similarity index 96%
rename from src/cloudflare/types/durable_object_binding.py
rename to src/cloudflare/types/workers/durable_object_binding.py
index 18ef1e02c4a..acef5a67aae 100644
--- a/src/cloudflare/types/durable_object_binding.py
+++ b/src/cloudflare/types/workers/durable_object_binding.py
@@ -3,7 +3,7 @@
from typing import Optional
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["DurableObjectBinding"]
diff --git a/src/cloudflare/types/durable_object_binding_param.py b/src/cloudflare/types/workers/durable_object_binding_param.py
similarity index 100%
rename from src/cloudflare/types/durable_object_binding_param.py
rename to src/cloudflare/types/workers/durable_object_binding_param.py
diff --git a/src/cloudflare/types/kv_namespace_binding.py b/src/cloudflare/types/workers/kv_namespace_binding.py
similarity index 92%
rename from src/cloudflare/types/kv_namespace_binding.py
rename to src/cloudflare/types/workers/kv_namespace_binding.py
index f2bfffc1856..bf28ce9caac 100644
--- a/src/cloudflare/types/kv_namespace_binding.py
+++ b/src/cloudflare/types/workers/kv_namespace_binding.py
@@ -2,7 +2,7 @@
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["KVNamespaceBinding"]
diff --git a/src/cloudflare/types/kv_namespace_binding_param.py b/src/cloudflare/types/workers/kv_namespace_binding_param.py
similarity index 100%
rename from src/cloudflare/types/kv_namespace_binding_param.py
rename to src/cloudflare/types/workers/kv_namespace_binding_param.py
diff --git a/src/cloudflare/types/migration_step.py b/src/cloudflare/types/workers/migration_step.py
similarity index 97%
rename from src/cloudflare/types/migration_step.py
rename to src/cloudflare/types/workers/migration_step.py
index 24ba3dbed16..c345d2027b6 100644
--- a/src/cloudflare/types/migration_step.py
+++ b/src/cloudflare/types/workers/migration_step.py
@@ -4,7 +4,7 @@
from pydantic import Field as FieldInfo
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["MigrationStep", "RenamedClass", "TransferredClass"]
diff --git a/src/cloudflare/types/migration_step_param.py b/src/cloudflare/types/workers/migration_step_param.py
similarity index 100%
rename from src/cloudflare/types/migration_step_param.py
rename to src/cloudflare/types/workers/migration_step_param.py
diff --git a/src/cloudflare/types/mtls_cert_binding.py b/src/cloudflare/types/workers/mtls_cert_binding.py
similarity index 93%
rename from src/cloudflare/types/mtls_cert_binding.py
rename to src/cloudflare/types/workers/mtls_cert_binding.py
index 36e81683b36..ce77744c7c7 100644
--- a/src/cloudflare/types/mtls_cert_binding.py
+++ b/src/cloudflare/types/workers/mtls_cert_binding.py
@@ -3,7 +3,7 @@
from typing import Optional
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["MTLSCERTBinding"]
diff --git a/src/cloudflare/types/mtls_cert_binding_param.py b/src/cloudflare/types/workers/mtls_cert_binding_param.py
similarity index 100%
rename from src/cloudflare/types/mtls_cert_binding_param.py
rename to src/cloudflare/types/workers/mtls_cert_binding_param.py
diff --git a/src/cloudflare/types/placement_configuration.py b/src/cloudflare/types/workers/placement_configuration.py
similarity index 93%
rename from src/cloudflare/types/placement_configuration.py
rename to src/cloudflare/types/workers/placement_configuration.py
index 13def2d7f05..0eb2b9eec7d 100644
--- a/src/cloudflare/types/placement_configuration.py
+++ b/src/cloudflare/types/workers/placement_configuration.py
@@ -3,7 +3,7 @@
from typing import Optional
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["PlacementConfiguration"]
diff --git a/src/cloudflare/types/placement_configuration_param.py b/src/cloudflare/types/workers/placement_configuration_param.py
similarity index 100%
rename from src/cloudflare/types/placement_configuration_param.py
rename to src/cloudflare/types/workers/placement_configuration_param.py
diff --git a/src/cloudflare/types/r2_binding.py b/src/cloudflare/types/workers/r2_binding.py
similarity index 92%
rename from src/cloudflare/types/r2_binding.py
rename to src/cloudflare/types/workers/r2_binding.py
index 79eb32f82fb..523844ac272 100644
--- a/src/cloudflare/types/r2_binding.py
+++ b/src/cloudflare/types/workers/r2_binding.py
@@ -2,7 +2,7 @@
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["R2Binding"]
diff --git a/src/cloudflare/types/r2_binding_param.py b/src/cloudflare/types/workers/r2_binding_param.py
similarity index 100%
rename from src/cloudflare/types/r2_binding_param.py
rename to src/cloudflare/types/workers/r2_binding_param.py
diff --git a/src/cloudflare/types/workers/script_update_params.py b/src/cloudflare/types/workers/script_update_params.py
index 23aac77d3b1..c919af30fc3 100644
--- a/src/cloudflare/types/workers/script_update_params.py
+++ b/src/cloudflare/types/workers/script_update_params.py
@@ -8,9 +8,9 @@
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 .stepped_migration_param import SteppedMigrationParam
+from .single_step_migration_param import SingleStepMigrationParam
+from .placement_configuration_param import PlacementConfigurationParam
__all__ = ["ScriptUpdateParams", "Variant0", "Variant0Metadata", "Variant0MetadataMigrations", "Variant1"]
diff --git a/src/cloudflare/types/workers/scripts/content_update_params.py b/src/cloudflare/types/workers/scripts/content_update_params.py
index 7455c2df074..8cc85869cad 100644
--- a/src/cloudflare/types/workers/scripts/content_update_params.py
+++ b/src/cloudflare/types/workers/scripts/content_update_params.py
@@ -7,7 +7,7 @@
from ...._types import FileTypes
from ...._utils import PropertyInfo
-from ...worker_metadata_param import WorkerMetadataParam
+from ..worker_metadata_param import WorkerMetadataParam
__all__ = ["ContentUpdateParams"]
diff --git a/src/cloudflare/types/service_binding.py b/src/cloudflare/types/workers/service_binding.py
similarity index 93%
rename from src/cloudflare/types/service_binding.py
rename to src/cloudflare/types/workers/service_binding.py
index ace4c814cb5..ffd0c7b07f5 100644
--- a/src/cloudflare/types/service_binding.py
+++ b/src/cloudflare/types/workers/service_binding.py
@@ -2,7 +2,7 @@
from typing_extensions import Literal
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["ServiceBinding"]
diff --git a/src/cloudflare/types/service_binding_param.py b/src/cloudflare/types/workers/service_binding_param.py
similarity index 100%
rename from src/cloudflare/types/service_binding_param.py
rename to src/cloudflare/types/workers/service_binding_param.py
diff --git a/src/cloudflare/types/single_step_migration.py b/src/cloudflare/types/workers/single_step_migration.py
similarity index 97%
rename from src/cloudflare/types/single_step_migration.py
rename to src/cloudflare/types/workers/single_step_migration.py
index 615d51a4905..2c07c2f4a22 100644
--- a/src/cloudflare/types/single_step_migration.py
+++ b/src/cloudflare/types/workers/single_step_migration.py
@@ -4,7 +4,7 @@
from pydantic import Field as FieldInfo
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["SingleStepMigration", "RenamedClass", "TransferredClass"]
diff --git a/src/cloudflare/types/single_step_migration_param.py b/src/cloudflare/types/workers/single_step_migration_param.py
similarity index 100%
rename from src/cloudflare/types/single_step_migration_param.py
rename to src/cloudflare/types/workers/single_step_migration_param.py
diff --git a/src/cloudflare/types/stepped_migration.py b/src/cloudflare/types/workers/stepped_migration.py
similarity index 94%
rename from src/cloudflare/types/stepped_migration.py
rename to src/cloudflare/types/workers/stepped_migration.py
index f89090e3e66..3383a9a473f 100644
--- a/src/cloudflare/types/stepped_migration.py
+++ b/src/cloudflare/types/workers/stepped_migration.py
@@ -2,7 +2,7 @@
from typing import List, Optional
-from .._models import BaseModel
+from ..._models import BaseModel
from .migration_step import MigrationStep
__all__ = ["SteppedMigration"]
diff --git a/src/cloudflare/types/stepped_migration_param.py b/src/cloudflare/types/workers/stepped_migration_param.py
similarity index 100%
rename from src/cloudflare/types/stepped_migration_param.py
rename to src/cloudflare/types/workers/stepped_migration_param.py
diff --git a/src/cloudflare/types/worker_metadata_param.py b/src/cloudflare/types/workers/worker_metadata_param.py
similarity index 100%
rename from src/cloudflare/types/worker_metadata_param.py
rename to src/cloudflare/types/workers/worker_metadata_param.py
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 c647e7127b7..0556bc03e02 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,10 +7,8 @@
from ....._types import FileTypes
from ....._utils import PropertyInfo
+from ....workers import SteppedMigrationParam, SingleStepMigrationParam, PlacementConfigurationParam
from ....workers.scripts import ConsumerScriptParam
-from ....stepped_migration_param import SteppedMigrationParam
-from ....single_step_migration_param import SingleStepMigrationParam
-from ....placement_configuration_param import PlacementConfigurationParam
__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 c294ece4d49..f228333a623 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 .....binding import Binding
+from .....workers 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 ae14a76e153..f3b9d5cb1dc 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 .....worker_metadata_param import WorkerMetadataParam
+from .....workers 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 46f4772625f..a51e4e5a291 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,11 +5,8 @@
from typing import List, Union, Iterable
from typing_extensions import Required, TypedDict
-from .....binding_param import BindingParam
+from .....workers import BindingParam, SteppedMigrationParam, SingleStepMigrationParam, PlacementConfigurationParam
from .....workers.scripts import ConsumerScriptParam
-from .....stepped_migration_param import SteppedMigrationParam
-from .....single_step_migration_param import SingleStepMigrationParam
-from .....placement_configuration_param import PlacementConfigurationParam
__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 49eac786783..57b7b07cee8 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,12 +2,9 @@
from typing import List, Union, Optional
-from .....binding import Binding
+from .....workers import Binding, SteppedMigration, SingleStepMigration, PlacementConfiguration
from ......_models import BaseModel
from .....workers.scripts import ConsumerScript
-from .....stepped_migration import SteppedMigration
-from .....single_step_migration import SingleStepMigration
-from .....placement_configuration import PlacementConfiguration
__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 4076f23ee32..f5892a091d4 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,12 +2,9 @@
from typing import List, Union, Optional
-from .....binding import Binding
+from .....workers import Binding, SteppedMigration, SingleStepMigration, PlacementConfiguration
from ......_models import BaseModel
from .....workers.scripts import ConsumerScript
-from .....stepped_migration import SteppedMigration
-from .....single_step_migration import SingleStepMigration
-from .....placement_configuration import PlacementConfiguration
__all__ = ["SettingGetResponse", "Limits", "Migrations"]
diff --git a/src/cloudflare/types/zones/__init__.py b/src/cloudflare/types/zones/__init__.py
index b3677ac247e..1f0b10e4ded 100644
--- a/src/cloudflare/types/zones/__init__.py
+++ b/src/cloudflare/types/zones/__init__.py
@@ -2,12 +2,17 @@
from __future__ import annotations
+from .zone import Zone as Zone
from .zone_hold import ZoneHold as ZoneHold
from .nameserver import Nameserver as Nameserver
from .dns_setting import DNSSetting as DNSSetting
from .nameserver_param import NameserverParam as NameserverParam
+from .zone_edit_params import ZoneEditParams as ZoneEditParams
+from .zone_list_params import ZoneListParams as ZoneListParams
from .hold_create_params import HoldCreateParams as HoldCreateParams
from .hold_delete_params import HoldDeleteParams as HoldDeleteParams
+from .zone_create_params import ZoneCreateParams as ZoneCreateParams
+from .zone_delete_response import ZoneDeleteResponse as ZoneDeleteResponse
from .dns_setting_edit_params import DNSSettingEditParams as DNSSettingEditParams
from .subscription_get_response import SubscriptionGetResponse as SubscriptionGetResponse
from .subscription_create_params import SubscriptionCreateParams as SubscriptionCreateParams
diff --git a/src/cloudflare/types/zone.py b/src/cloudflare/types/zones/zone.py
similarity index 98%
rename from src/cloudflare/types/zone.py
rename to src/cloudflare/types/zones/zone.py
index d32a80cf5a6..74e8da2e9ef 100644
--- a/src/cloudflare/types/zone.py
+++ b/src/cloudflare/types/zones/zone.py
@@ -3,7 +3,7 @@
from typing import List, Optional
from datetime import datetime
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["Zone", "Account", "Meta", "Owner"]
diff --git a/src/cloudflare/types/zone_create_params.py b/src/cloudflare/types/zones/zone_create_params.py
similarity index 100%
rename from src/cloudflare/types/zone_create_params.py
rename to src/cloudflare/types/zones/zone_create_params.py
diff --git a/src/cloudflare/types/zone_delete_response.py b/src/cloudflare/types/zones/zone_delete_response.py
similarity index 85%
rename from src/cloudflare/types/zone_delete_response.py
rename to src/cloudflare/types/zones/zone_delete_response.py
index b18810c4606..8c55f4a3e09 100644
--- a/src/cloudflare/types/zone_delete_response.py
+++ b/src/cloudflare/types/zones/zone_delete_response.py
@@ -1,6 +1,6 @@
# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-from .._models import BaseModel
+from ..._models import BaseModel
__all__ = ["ZoneDeleteResponse"]
diff --git a/src/cloudflare/types/zone_edit_params.py b/src/cloudflare/types/zones/zone_edit_params.py
similarity index 100%
rename from src/cloudflare/types/zone_edit_params.py
rename to src/cloudflare/types/zones/zone_edit_params.py
diff --git a/src/cloudflare/types/zone_list_params.py b/src/cloudflare/types/zones/zone_list_params.py
similarity index 100%
rename from src/cloudflare/types/zone_list_params.py
rename to src/cloudflare/types/zones/zone_list_params.py
diff --git a/tests/api_resources/d1/test_database.py b/tests/api_resources/d1/test_database.py
index c252773edc8..8005deeea4b 100644
--- a/tests/api_resources/d1/test_database.py
+++ b/tests/api_resources/d1/test_database.py
@@ -9,8 +9,8 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import D1
from cloudflare.types.d1 import (
+ D1,
DatabaseListResponse,
DatabaseQueryResponse,
DatabaseCreateResponse,
diff --git a/tests/api_resources/healthchecks/test_previews.py b/tests/api_resources/healthchecks/test_previews.py
index 016bfb89408..a5eba5e0e78 100644
--- a/tests/api_resources/healthchecks/test_previews.py
+++ b/tests/api_resources/healthchecks/test_previews.py
@@ -9,8 +9,10 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import Healthcheck
-from cloudflare.types.healthchecks import PreviewDeleteResponse
+from cloudflare.types.healthchecks import (
+ Healthcheck,
+ PreviewDeleteResponse,
+)
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 60007df0833..1170bd21c14 100644
--- a/tests/api_resources/hyperdrive/test_configs.py
+++ b/tests/api_resources/hyperdrive/test_configs.py
@@ -9,9 +9,9 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import Hyperdrive
from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
from cloudflare.types.hyperdrive import (
+ Hyperdrive,
ConfigDeleteResponse,
)
diff --git a/tests/api_resources/rulesets/phases/test_versions.py b/tests/api_resources/rulesets/phases/test_versions.py
index 10a67ea158d..ab4e35406ce 100644
--- a/tests/api_resources/rulesets/phases/test_versions.py
+++ b/tests/api_resources/rulesets/phases/test_versions.py
@@ -9,8 +9,8 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import Ruleset
from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.rulesets import Ruleset
from cloudflare.types.rulesets.phases 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_versions.py b/tests/api_resources/rulesets/test_versions.py
index ea9adbc6714..54605005c49 100644
--- a/tests/api_resources/rulesets/test_versions.py
+++ b/tests/api_resources/rulesets/test_versions.py
@@ -9,9 +9,8 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import Ruleset
from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.rulesets import VersionGetResponse
+from cloudflare.types.rulesets import Ruleset, VersionGetResponse
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 43a53f675ee..03849cde63e 100644
--- a/tests/api_resources/stream/test_copy.py
+++ b/tests/api_resources/stream/test_copy.py
@@ -9,8 +9,8 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import Video
from cloudflare._utils import parse_datetime
+from cloudflare.types.stream import Video
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 272bd5c46fc..c7b2f9d72ae 100644
--- a/tests/api_resources/test_accounts.py
+++ b/tests/api_resources/test_accounts.py
@@ -9,8 +9,11 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import AccountGetResponse, AccountUpdateResponse
from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.accounts import (
+ AccountGetResponse,
+ AccountUpdateResponse,
+)
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 631f4206a83..89ed539135b 100644
--- a/tests/api_resources/test_bot_management.py
+++ b/tests/api_resources/test_bot_management.py
@@ -9,7 +9,10 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import BotManagementGetResponse, BotManagementUpdateResponse
+from cloudflare.types.bot_management import (
+ BotManagementGetResponse,
+ 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 8dac9fc9c60..61e951f87a5 100644
--- a/tests/api_resources/test_brand_protection.py
+++ b/tests/api_resources/test_brand_protection.py
@@ -9,7 +9,10 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import Info, Submit
+from cloudflare.types.brand_protection import (
+ Info,
+ 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 e3e932d5a24..c1650d57e93 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 import CachePurgeResponse
+from cloudflare.types.cache 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 34125f96aab..1198441de22 100644
--- a/tests/api_resources/test_calls.py
+++ b/tests/api_resources/test_calls.py
@@ -9,8 +9,8 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import CallsApp, CallsAppWithSecret
from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.calls import CallsApp, 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 1f3fb7fbd8f..307a72b3d52 100644
--- a/tests/api_resources/test_client_certificates.py
+++ b/tests/api_resources/test_client_certificates.py
@@ -9,8 +9,10 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import ClientCertificate
from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.client_certificates 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 81fa03c2e4e..b5fab9af7a1 100644
--- a/tests/api_resources/test_custom_certificates.py
+++ b/tests/api_resources/test_custom_certificates.py
@@ -9,14 +9,14 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import (
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.custom_certificates import (
CustomCertificate,
CustomCertificateGetResponse,
CustomCertificateEditResponse,
CustomCertificateCreateResponse,
CustomCertificateDeleteResponse,
)
-from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
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 e45d10f59fd..2b80903b4ef 100644
--- a/tests/api_resources/test_custom_hostnames.py
+++ b/tests/api_resources/test_custom_hostnames.py
@@ -9,14 +9,14 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import (
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.custom_hostnames import (
CustomHostnameGetResponse,
CustomHostnameEditResponse,
CustomHostnameListResponse,
CustomHostnameCreateResponse,
CustomHostnameDeleteResponse,
)
-from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
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 502a47dd718..f85006a7d77 100644
--- a/tests/api_resources/test_custom_nameservers.py
+++ b/tests/api_resources/test_custom_nameservers.py
@@ -9,7 +9,7 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import (
+from cloudflare.types.custom_nameservers import (
CustomNameserver,
CustomNameserverGetResponse,
CustomNameserverDeleteResponse,
diff --git a/tests/api_resources/test_dnssec.py b/tests/api_resources/test_dnssec.py
index 6294090c744..69a5f52ccc1 100644
--- a/tests/api_resources/test_dnssec.py
+++ b/tests/api_resources/test_dnssec.py
@@ -9,7 +9,7 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import DNSSEC, DNSSECDeleteResponse
+from cloudflare.types.dnssec import DNSSEC, 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 a7a475c9ee7..92d55fc3c61 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 import Settings
+from cloudflare.types.email_routing 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 f2a01000797..c4db83fbe0d 100644
--- a/tests/api_resources/test_filters.py
+++ b/tests/api_resources/test_filters.py
@@ -9,11 +9,11 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import (
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.filters import (
FirewallFilter,
FilterCreateResponse,
)
-from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
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 cb8e16ca7bb..48d0902ff92 100644
--- a/tests/api_resources/test_healthchecks.py
+++ b/tests/api_resources/test_healthchecks.py
@@ -9,11 +9,11 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import (
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.healthchecks import (
Healthcheck,
HealthcheckDeleteResponse,
)
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
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 cfbc33fa51f..b1aeb0d230a 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 import IPListResponse
+from cloudflare.types.ips 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 89d02091487..2fda38574ca 100644
--- a/tests/api_resources/test_keyless_certificates.py
+++ b/tests/api_resources/test_keyless_certificates.py
@@ -9,11 +9,11 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import (
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.keyless_certificates import (
KeylessCertificate,
KeylessCertificateDeleteResponse,
)
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
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 e16f28102e5..e81f848af0b 100644
--- a/tests/api_resources/test_load_balancers.py
+++ b/tests/api_resources/test_load_balancers.py
@@ -9,11 +9,11 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import (
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.load_balancers import (
LoadBalancer,
LoadBalancerDeleteResponse,
)
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
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 73f304ba56a..f84f3910e47 100644
--- a/tests/api_resources/test_managed_headers.py
+++ b/tests/api_resources/test_managed_headers.py
@@ -9,7 +9,10 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import ManagedHeaderEditResponse, ManagedHeaderListResponse
+from cloudflare.types.managed_headers import (
+ ManagedHeaderEditResponse,
+ 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 5f0f4fb7056..e4e6916b468 100644
--- a/tests/api_resources/test_memberships.py
+++ b/tests/api_resources/test_memberships.py
@@ -9,13 +9,13 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import (
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.memberships import (
Membership,
MembershipGetResponse,
MembershipDeleteResponse,
MembershipUpdateResponse,
)
-from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
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 336ea838c6f..9ea40b98793 100644
--- a/tests/api_resources/test_mtls_certificates.py
+++ b/tests/api_resources/test_mtls_certificates.py
@@ -9,11 +9,11 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import (
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.mtls_certificates import (
MTLSCertificate,
MTLSCertificateCreateResponse,
)
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
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 1b640b94000..f079d8895bd 100644
--- a/tests/api_resources/test_origin_ca_certificates.py
+++ b/tests/api_resources/test_origin_ca_certificates.py
@@ -9,13 +9,13 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import (
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.origin_ca_certificates import (
OriginCACertificate,
OriginCACertificateGetResponse,
OriginCACertificateCreateResponse,
OriginCACertificateDeleteResponse,
)
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
diff --git a/tests/api_resources/test_origin_post_quantum_encryption.py b/tests/api_resources/test_origin_post_quantum_encryption.py
index 794b93f5d90..0c73b6de410 100644
--- a/tests/api_resources/test_origin_post_quantum_encryption.py
+++ b/tests/api_resources/test_origin_post_quantum_encryption.py
@@ -9,7 +9,7 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import (
+from cloudflare.types.origin_post_quantum_encryption import (
OriginPostQuantumEncryptionGetResponse,
OriginPostQuantumEncryptionUpdateResponse,
)
diff --git a/tests/api_resources/test_origin_tls_client_auth.py b/tests/api_resources/test_origin_tls_client_auth.py
index 805df523520..04089145986 100644
--- a/tests/api_resources/test_origin_tls_client_auth.py
+++ b/tests/api_resources/test_origin_tls_client_auth.py
@@ -9,13 +9,13 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import (
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.origin_tls_client_auth import (
ZoneAuthenticatedOriginPull,
OriginTLSClientAuthGetResponse,
OriginTLSClientAuthCreateResponse,
OriginTLSClientAuthDeleteResponse,
)
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
diff --git a/tests/api_resources/test_page_shield.py b/tests/api_resources/test_page_shield.py
index e52ec5c9eb5..d8460c4c9e2 100644
--- a/tests/api_resources/test_page_shield.py
+++ b/tests/api_resources/test_page_shield.py
@@ -9,7 +9,7 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import Setting, PageShieldUpdateResponse
+from cloudflare.types.page_shield import Setting, 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 7fd08df0297..b665a87ea0e 100644
--- a/tests/api_resources/test_pagerules.py
+++ b/tests/api_resources/test_pagerules.py
@@ -9,7 +9,7 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import (
+from cloudflare.types.pagerules import (
PageruleGetResponse,
PageruleEditResponse,
PageruleListResponse,
diff --git a/tests/api_resources/test_pcaps.py b/tests/api_resources/test_pcaps.py
index 2db05d99367..712c52bdcde 100644
--- a/tests/api_resources/test_pcaps.py
+++ b/tests/api_resources/test_pcaps.py
@@ -9,8 +9,8 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import PCAPGetResponse, PCAPListResponse, PCAPCreateResponse
from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.pcaps import PCAPGetResponse, PCAPListResponse, 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 68d14414ec9..69ea76c8e6e 100644
--- a/tests/api_resources/test_plans.py
+++ b/tests/api_resources/test_plans.py
@@ -9,8 +9,8 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import AvailableRatePlan
from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.plans 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 470a8ada8e7..b5d74febfc7 100644
--- a/tests/api_resources/test_queues.py
+++ b/tests/api_resources/test_queues.py
@@ -9,13 +9,13 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import (
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.queues import (
Queue,
QueueCreated,
QueueUpdated,
QueueDeleteResponse,
)
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
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 b95d91fd931..67e2f73ad79 100644
--- a/tests/api_resources/test_rate_limits.py
+++ b/tests/api_resources/test_rate_limits.py
@@ -9,14 +9,14 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import (
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.rate_limits import (
RateLimit,
RateLimitGetResponse,
RateLimitEditResponse,
RateLimitCreateResponse,
RateLimitDeleteResponse,
)
-from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
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 a4cb7576276..c237fc40ca1 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 import RatePlanGetResponse
+from cloudflare.types.rate_plans 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 19e9f3e75d0..695ae120700 100644
--- a/tests/api_resources/test_rulesets.py
+++ b/tests/api_resources/test_rulesets.py
@@ -9,13 +9,13 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import (
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.rulesets import (
Ruleset,
RulesetGetResponse,
RulesetCreateResponse,
RulesetUpdateResponse,
)
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
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 a47c07cf315..c50daf3c503 100644
--- a/tests/api_resources/test_snippets.py
+++ b/tests/api_resources/test_snippets.py
@@ -9,8 +9,8 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import Snippet, SnippetDeleteResponse
from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.snippets import Snippet, 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 0a442147be7..4b3081ae272 100644
--- a/tests/api_resources/test_speed.py
+++ b/tests/api_resources/test_speed.py
@@ -9,12 +9,12 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import (
+from cloudflare._utils import parse_datetime
+from cloudflare.types.speed import (
Trend,
+ Schedule,
SpeedDeleteResponse,
)
-from cloudflare._utils import parse_datetime
-from cloudflare.types.speed import Schedule
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 47203c71641..97f94254e43 100644
--- a/tests/api_resources/test_stream.py
+++ b/tests/api_resources/test_stream.py
@@ -9,9 +9,9 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import Video
from cloudflare._utils import parse_datetime
from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.stream 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 aeb9314fb21..8ed827eede8 100644
--- a/tests/api_resources/test_subscriptions.py
+++ b/tests/api_resources/test_subscriptions.py
@@ -9,14 +9,14 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import (
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.user import Subscription
+from cloudflare.types.subscriptions import (
SubscriptionGetResponse,
SubscriptionCreateResponse,
SubscriptionDeleteResponse,
SubscriptionUpdateResponse,
)
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
-from cloudflare.types.user import Subscription
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 a97f75691b2..8cc032ab3e1 100644
--- a/tests/api_resources/test_url_normalization.py
+++ b/tests/api_resources/test_url_normalization.py
@@ -9,7 +9,7 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import (
+from cloudflare.types.url_normalization import (
URLNormalizationGetResponse,
URLNormalizationUpdateResponse,
)
diff --git a/tests/api_resources/test_url_scanner.py b/tests/api_resources/test_url_scanner.py
index d1c66aed261..edfb0767105 100644
--- a/tests/api_resources/test_url_scanner.py
+++ b/tests/api_resources/test_url_scanner.py
@@ -9,8 +9,8 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import URLScannerScanResponse
from cloudflare._utils import parse_datetime
+from cloudflare.types.url_scanner 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 0d384f15858..9207b88ab67 100644
--- a/tests/api_resources/test_user.py
+++ b/tests/api_resources/test_user.py
@@ -9,7 +9,7 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import UserGetResponse, UserEditResponse
+from cloudflare.types.user import UserGetResponse, 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 5ad93c23167..e8958b282f2 100644
--- a/tests/api_resources/test_waiting_rooms.py
+++ b/tests/api_resources/test_waiting_rooms.py
@@ -9,11 +9,11 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import (
+from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
+from cloudflare.types.waiting_rooms import (
WaitingRoom,
WaitingRoomDeleteResponse,
)
-from cloudflare.pagination import SyncSinglePage, AsyncSinglePage
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 9a8ad00e596..4a4eb24fc85 100644
--- a/tests/api_resources/test_warp_connector.py
+++ b/tests/api_resources/test_warp_connector.py
@@ -9,7 +9,9 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import (
+from cloudflare._utils import parse_datetime
+from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.warp_connector import (
WARPConnectorGetResponse,
WARPConnectorEditResponse,
WARPConnectorListResponse,
@@ -17,8 +19,6 @@
WARPConnectorCreateResponse,
WARPConnectorDeleteResponse,
)
-from cloudflare._utils import parse_datetime
-from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
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 a0fc3e6f431..4e5a3fad6d3 100644
--- a/tests/api_resources/test_zones.py
+++ b/tests/api_resources/test_zones.py
@@ -9,8 +9,8 @@
from cloudflare import Cloudflare, AsyncCloudflare
from tests.utils import assert_matches_type
-from cloudflare.types import Zone, ZoneDeleteResponse
from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from cloudflare.types.zones import Zone, ZoneDeleteResponse
base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")