chore(internal): remove some duplicated imports

src/cloudflare/resources/accounts/accounts.py

@@ -15,14 +15,6 @@
     RolesResourceWithStreamingResponse,
     AsyncRolesResourceWithStreamingResponse,
 )
-from .tokens import (
-    TokensResource,
-    AsyncTokensResource,
-    TokensResourceWithRawResponse,
-    AsyncTokensResourceWithRawResponse,
-    TokensResourceWithStreamingResponse,
-    AsyncTokensResourceWithStreamingResponse,
-)
 from .members import (
     MembersResource,
     AsyncMembersResource,
@@ -54,7 +46,14 @@
     SubscriptionsResourceWithStreamingResponse,
     AsyncSubscriptionsResourceWithStreamingResponse,
 )
-from .tokens.tokens import TokensResource, AsyncTokensResource
+from .tokens.tokens import (
+    TokensResource,
+    AsyncTokensResource,
+    TokensResourceWithRawResponse,
+    AsyncTokensResourceWithRawResponse,
+    TokensResourceWithStreamingResponse,
+    AsyncTokensResourceWithStreamingResponse,
+)
 from ..._base_client import AsyncPaginator, make_request_options
 from ...types.accounts import account_list_params, account_create_params, account_update_params
 from ...types.accounts.account import Account

src/cloudflare/resources/addressing/addressing.py

@@ -2,14 +2,6 @@
 
 from __future__ import annotations
 
-from .prefixes import (
-    PrefixesResource,
-    AsyncPrefixesResource,
-    PrefixesResourceWithRawResponse,
-    AsyncPrefixesResourceWithRawResponse,
-    PrefixesResourceWithStreamingResponse,
-    AsyncPrefixesResourceWithStreamingResponse,
-)
 from .services import (
     ServicesResource,
     AsyncServicesResource,
@@ -20,34 +12,38 @@
 )
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
-from .address_maps import (
+from .prefixes.prefixes import (
+    PrefixesResource,
+    AsyncPrefixesResource,
+    PrefixesResourceWithRawResponse,
+    AsyncPrefixesResourceWithRawResponse,
+    PrefixesResourceWithStreamingResponse,
+    AsyncPrefixesResourceWithStreamingResponse,
+)
+from .address_maps.address_maps import (
     AddressMapsResource,
     AsyncAddressMapsResource,
     AddressMapsResourceWithRawResponse,
     AsyncAddressMapsResourceWithRawResponse,
     AddressMapsResourceWithStreamingResponse,
     AsyncAddressMapsResourceWithStreamingResponse,
 )
-from .loa_documents import (
+from .loa_documents.loa_documents import (
     LOADocumentsResource,
     AsyncLOADocumentsResource,
     LOADocumentsResourceWithRawResponse,
     AsyncLOADocumentsResourceWithRawResponse,
     LOADocumentsResourceWithStreamingResponse,
     AsyncLOADocumentsResourceWithStreamingResponse,
 )
-from .prefixes.prefixes import PrefixesResource, AsyncPrefixesResource
-from .regional_hostnames import (
+from .regional_hostnames.regional_hostnames import (
     RegionalHostnamesResource,
     AsyncRegionalHostnamesResource,
     RegionalHostnamesResourceWithRawResponse,
     AsyncRegionalHostnamesResourceWithRawResponse,
     RegionalHostnamesResourceWithStreamingResponse,
     AsyncRegionalHostnamesResourceWithStreamingResponse,
 )
-from .address_maps.address_maps import AddressMapsResource, AsyncAddressMapsResource
-from .loa_documents.loa_documents import LOADocumentsResource, AsyncLOADocumentsResource
-from .regional_hostnames.regional_hostnames import RegionalHostnamesResource, AsyncRegionalHostnamesResource
 
 __all__ = ["AddressingResource", "AsyncAddressingResource"]
 

src/cloudflare/resources/addressing/prefixes/prefixes.py

@@ -6,15 +6,14 @@
 
 import httpx
 
-from .bgp import (
+from .bgp.bgp import (
     BGPResource,
     AsyncBGPResource,
     BGPResourceWithRawResponse,
     AsyncBGPResourceWithRawResponse,
     BGPResourceWithStreamingResponse,
     AsyncBGPResourceWithStreamingResponse,
 )
-from .bgp.bgp import BGPResource, AsyncBGPResource
 from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
 from ...._utils import (
     maybe_transform,

src/cloudflare/resources/ai/ai.py

@@ -7,14 +7,6 @@
 
 import httpx
 
-from .models import (
-    ModelsResource,
-    AsyncModelsResource,
-    ModelsResourceWithRawResponse,
-    AsyncModelsResourceWithRawResponse,
-    ModelsResourceWithStreamingResponse,
-    AsyncModelsResourceWithStreamingResponse,
-)
 from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
 from ..._utils import (
     required_args,
@@ -31,7 +23,14 @@
     async_to_streamed_response_wrapper,
 )
 from ..._wrappers import ResultWrapper
-from .models.models import ModelsResource, AsyncModelsResource
+from .models.models import (
+    ModelsResource,
+    AsyncModelsResource,
+    ModelsResourceWithRawResponse,
+    AsyncModelsResourceWithRawResponse,
+    ModelsResourceWithStreamingResponse,
+    AsyncModelsResourceWithStreamingResponse,
+)
 from ..._base_client import make_request_options
 from ...types.ai.ai_run_response import AIRunResponse
 

src/cloudflare/resources/alerting/alerting.py

@@ -20,14 +20,6 @@
 )
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
-from .destinations import (
-    DestinationsResource,
-    AsyncDestinationsResource,
-    DestinationsResourceWithRawResponse,
-    AsyncDestinationsResourceWithRawResponse,
-    DestinationsResourceWithStreamingResponse,
-    AsyncDestinationsResourceWithStreamingResponse,
-)
 from .available_alerts import (
     AvailableAlertsResource,
     AsyncAvailableAlertsResource,
@@ -36,7 +28,14 @@
     AvailableAlertsResourceWithStreamingResponse,
     AsyncAvailableAlertsResourceWithStreamingResponse,
 )
-from .destinations.destinations import DestinationsResource, AsyncDestinationsResource
+from .destinations.destinations import (
+    DestinationsResource,
+    AsyncDestinationsResource,
+    DestinationsResourceWithRawResponse,
+    AsyncDestinationsResourceWithRawResponse,
+    DestinationsResourceWithStreamingResponse,
+    AsyncDestinationsResourceWithStreamingResponse,
+)
 
 __all__ = ["AlertingResource", "AsyncAlertingResource"]
 

src/cloudflare/resources/api_gateway/api_gateway.py

@@ -10,61 +10,56 @@
     SchemasResourceWithStreamingResponse,
     AsyncSchemasResourceWithStreamingResponse,
 )
-from .settings import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .configurations import (
+    ConfigurationsResource,
+    AsyncConfigurationsResource,
+    ConfigurationsResourceWithRawResponse,
+    AsyncConfigurationsResourceWithRawResponse,
+    ConfigurationsResourceWithStreamingResponse,
+    AsyncConfigurationsResourceWithStreamingResponse,
+)
+from .settings.settings import (
     SettingsResource,
     AsyncSettingsResource,
     SettingsResourceWithRawResponse,
     AsyncSettingsResourceWithRawResponse,
     SettingsResourceWithStreamingResponse,
     AsyncSettingsResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from .discovery import (
+from .discovery.discovery import (
     DiscoveryResource,
     AsyncDiscoveryResource,
     DiscoveryResourceWithRawResponse,
     AsyncDiscoveryResourceWithRawResponse,
     DiscoveryResourceWithStreamingResponse,
     AsyncDiscoveryResourceWithStreamingResponse,
 )
-from .operations import (
+from .operations.operations import (
     OperationsResource,
     AsyncOperationsResource,
     OperationsResourceWithRawResponse,
     AsyncOperationsResourceWithRawResponse,
     OperationsResourceWithStreamingResponse,
     AsyncOperationsResourceWithStreamingResponse,
 )
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .user_schemas import (
+from .user_schemas.user_schemas import (
     UserSchemasResource,
     AsyncUserSchemasResource,
     UserSchemasResourceWithRawResponse,
     AsyncUserSchemasResourceWithRawResponse,
     UserSchemasResourceWithStreamingResponse,
     AsyncUserSchemasResourceWithStreamingResponse,
 )
-from .configurations import (
-    ConfigurationsResource,
-    AsyncConfigurationsResource,
-    ConfigurationsResourceWithRawResponse,
-    AsyncConfigurationsResourceWithRawResponse,
-    ConfigurationsResourceWithStreamingResponse,
-    AsyncConfigurationsResourceWithStreamingResponse,
-)
-from .settings.settings import SettingsResource, AsyncSettingsResource
-from .discovery.discovery import DiscoveryResource, AsyncDiscoveryResource
-from .expression_template import (
+from .expression_template.expression_template import (
     ExpressionTemplateResource,
     AsyncExpressionTemplateResource,
     ExpressionTemplateResourceWithRawResponse,
     AsyncExpressionTemplateResourceWithRawResponse,
     ExpressionTemplateResourceWithStreamingResponse,
     AsyncExpressionTemplateResourceWithStreamingResponse,
 )
-from .operations.operations import OperationsResource, AsyncOperationsResource
-from .user_schemas.user_schemas import UserSchemasResource, AsyncUserSchemasResource
-from .expression_template.expression_template import ExpressionTemplateResource, AsyncExpressionTemplateResource
 
 __all__ = ["APIGatewayResource", "AsyncAPIGatewayResource"]
 

src/cloudflare/resources/botnet_feed/botnet_feed.py

@@ -10,17 +10,16 @@
     ASNResourceWithStreamingResponse,
     AsyncASNResourceWithStreamingResponse,
 )
-from .configs import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .configs.configs import (
     ConfigsResource,
     AsyncConfigsResource,
     ConfigsResourceWithRawResponse,
     AsyncConfigsResourceWithRawResponse,
     ConfigsResourceWithStreamingResponse,
     AsyncConfigsResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .configs.configs import ConfigsResource, AsyncConfigsResource
 
 __all__ = ["BotnetFeedResource", "AsyncBotnetFeedResource"]
 

src/cloudflare/resources/cloudforce_one/cloudforce_one.py

@@ -2,17 +2,16 @@
 
 from __future__ import annotations
 
-from .requests import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .requests.requests import (
     RequestsResource,
     AsyncRequestsResource,
     RequestsResourceWithRawResponse,
     AsyncRequestsResourceWithRawResponse,
     RequestsResourceWithStreamingResponse,
     AsyncRequestsResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .requests.requests import RequestsResource, AsyncRequestsResource
 
 __all__ = ["CloudforceOneResource", "AsyncCloudforceOneResource"]
 

src/cloudflare/resources/dns/analytics/analytics.py

@@ -2,17 +2,16 @@
 
 from __future__ import annotations
 
-from .reports import (
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from .reports.reports import (
     ReportsResource,
     AsyncReportsResource,
     ReportsResourceWithRawResponse,
     AsyncReportsResourceWithRawResponse,
     ReportsResourceWithStreamingResponse,
     AsyncReportsResourceWithStreamingResponse,
 )
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from .reports.reports import ReportsResource, AsyncReportsResource
 
 __all__ = ["AnalyticsResource", "AsyncAnalyticsResource"]
 

src/cloudflare/resources/dns/dns.py

@@ -18,35 +18,32 @@
     RecordsResourceWithStreamingResponse,
     AsyncRecordsResourceWithStreamingResponse,
 )
-from .settings import (
+from ..._compat import cached_property
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from .settings.settings import (
     SettingsResource,
     AsyncSettingsResource,
     SettingsResourceWithRawResponse,
     AsyncSettingsResourceWithRawResponse,
     SettingsResourceWithStreamingResponse,
     AsyncSettingsResourceWithStreamingResponse,
 )
-from ..._compat import cached_property
-from .analytics import (
+from .analytics.analytics import (
     AnalyticsResource,
     AsyncAnalyticsResource,
     AnalyticsResourceWithRawResponse,
     AsyncAnalyticsResourceWithRawResponse,
     AnalyticsResourceWithStreamingResponse,
     AsyncAnalyticsResourceWithStreamingResponse,
 )
-from ..._resource import SyncAPIResource, AsyncAPIResource
-from .zone_transfers import (
+from .zone_transfers.zone_transfers import (
     ZoneTransfersResource,
     AsyncZoneTransfersResource,
     ZoneTransfersResourceWithRawResponse,
     AsyncZoneTransfersResourceWithRawResponse,
     ZoneTransfersResourceWithStreamingResponse,
     AsyncZoneTransfersResourceWithStreamingResponse,
 )
-from .settings.settings import SettingsResource, AsyncSettingsResource
-from .analytics.analytics import AnalyticsResource, AsyncAnalyticsResource
-from .zone_transfers.zone_transfers import ZoneTransfersResource, AsyncZoneTransfersResource
 
 __all__ = ["DNSResource", "AsyncDNSResource"]
 

src/cloudflare/resources/dns/zone_transfers/zone_transfers.py

@@ -34,14 +34,6 @@
     IncomingResourceWithStreamingResponse,
     AsyncIncomingResourceWithStreamingResponse,
 )
-from .outgoing import (
-    OutgoingResource,
-    AsyncOutgoingResource,
-    OutgoingResourceWithRawResponse,
-    AsyncOutgoingResourceWithRawResponse,
-    OutgoingResourceWithStreamingResponse,
-    AsyncOutgoingResourceWithStreamingResponse,
-)
 from ...._compat import cached_property
 from .force_axfr import (
     ForceAXFRResource,
@@ -52,7 +44,14 @@
     AsyncForceAXFRResourceWithStreamingResponse,
 )
 from ...._resource import SyncAPIResource, AsyncAPIResource
-from .outgoing.outgoing import OutgoingResource, AsyncOutgoingResource
+from .outgoing.outgoing import (
+    OutgoingResource,
+    AsyncOutgoingResource,
+    OutgoingResourceWithRawResponse,
+    AsyncOutgoingResourceWithRawResponse,
+    OutgoingResourceWithStreamingResponse,
+    AsyncOutgoingResourceWithStreamingResponse,
+)
 
 __all__ = ["ZoneTransfersResource", "AsyncZoneTransfersResource"]