Merge pull request #2710 from cloudflare/staging-next

✽ Sync staged changes

Author: musa-cf

.stats.yml

@@ -1,4 +1,4 @@
-configured_endpoints: 2304
-openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/cloudflare/cloudflare-b841673c088e755bc04d2a0852e97ef3bb7d3c60d13bf9c0ac6f631d38fa5e5b.yml
-openapi_spec_hash: d9813b2d4243b7d9fa43c5c9e8bc996f
-config_hash: bbf9427136a35ea3704b605309480336
+configured_endpoints: 2317
+openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/cloudflare/cloudflare-6c72aaee26a255cefb59365441066a292ee06cff650529eb8b95d9ffb73ec13a.yml
+openapi_spec_hash: 393731844a065cd2de4b422825007b70
+config_hash: fb00b1d45d83236f53f8ef08adb2db5c

api.md

@@ -65,6 +65,8 @@ from cloudflare.types import (
 
 # [CustomNameservers](src/cloudflare/resources/custom_nameservers/api.md)
 
+# [TenantCustomNameservers](src/cloudflare/resources/tenant_custom_nameservers/api.md)
+
 # [DNSFirewall](src/cloudflare/resources/dns_firewall/api.md)
 
 # [DNS](src/cloudflare/resources/dns/api.md)
@@ -229,6 +231,8 @@ from cloudflare.types import (
 
 # [AISecurity](src/cloudflare/resources/ai_security/api.md)
 
+# [CsamScanner](src/cloudflare/resources/csam_scanner/api.md)
+
 # [AbuseReports](src/cloudflare/resources/abuse_reports/api.md)
 
 # [AI](src/cloudflare/resources/ai/api.md)

src/cloudflare/_client.py

@@ -99,6 +99,7 @@
         rate_limits,
         url_scanner,
         connectivity,
+        csam_scanner,
         custom_pages,
         dns_firewall,
         healthchecks,
@@ -147,6 +148,7 @@
         certificate_authorities,
         leaked_credential_checks,
         magic_network_monitoring,
+        tenant_custom_nameservers,
         origin_post_quantum_encryption,
     )
     from .resources.ai.ai import AIResource, AsyncAIResource
@@ -210,6 +212,7 @@
     from .resources.rate_limits.rate_limits import RateLimitsResource, AsyncRateLimitsResource
     from .resources.url_scanner.url_scanner import URLScannerResource, AsyncURLScannerResource
     from .resources.connectivity.connectivity import ConnectivityResource, AsyncConnectivityResource
+    from .resources.csam_scanner.csam_scanner import CsamScannerResource, AsyncCsamScannerResource
     from .resources.custom_pages.custom_pages import CustomPagesResource, AsyncCustomPagesResource
     from .resources.dns_firewall.dns_firewall import DNSFirewallResource, AsyncDNSFirewallResource
     from .resources.healthchecks.healthchecks import HealthchecksResource, AsyncHealthchecksResource
@@ -300,6 +303,10 @@
         MagicNetworkMonitoringResource,
         AsyncMagicNetworkMonitoringResource,
     )
+    from .resources.tenant_custom_nameservers.tenant_custom_nameservers import (
+        TenantCustomNameserversResource,
+        AsyncTenantCustomNameserversResource,
+    )
     from .resources.origin_post_quantum_encryption.origin_post_quantum_encryption import (
         OriginPostQuantumEncryptionResource,
         AsyncOriginPostQuantumEncryptionResource,
@@ -511,6 +518,12 @@ def custom_nameservers(self) -> CustomNameserversResource:
 
         return CustomNameserversResource(self)
 
+    @cached_property
+    def tenant_custom_nameservers(self) -> TenantCustomNameserversResource:
+        from .resources.tenant_custom_nameservers import TenantCustomNameserversResource
+
+        return TenantCustomNameserversResource(self)
+
     @cached_property
     def dns_firewall(self) -> DNSFirewallResource:
         from .resources.dns_firewall import DNSFirewallResource
@@ -1003,6 +1016,12 @@ def ai_security(self) -> AISecurityResource:
 
         return AISecurityResource(self)
 
+    @cached_property
+    def csam_scanner(self) -> CsamScannerResource:
+        from .resources.csam_scanner import CsamScannerResource
+
+        return CsamScannerResource(self)
+
     @cached_property
     def abuse_reports(self) -> AbuseReportsResource:
         from .resources.abuse_reports import AbuseReportsResource
@@ -1433,6 +1452,12 @@ def custom_nameservers(self) -> AsyncCustomNameserversResource:
 
         return AsyncCustomNameserversResource(self)
 
+    @cached_property
+    def tenant_custom_nameservers(self) -> AsyncTenantCustomNameserversResource:
+        from .resources.tenant_custom_nameservers import AsyncTenantCustomNameserversResource
+
+        return AsyncTenantCustomNameserversResource(self)
+
     @cached_property
     def dns_firewall(self) -> AsyncDNSFirewallResource:
         from .resources.dns_firewall import AsyncDNSFirewallResource
@@ -1925,6 +1950,12 @@ def ai_security(self) -> AsyncAISecurityResource:
 
         return AsyncAISecurityResource(self)
 
+    @cached_property
+    def csam_scanner(self) -> AsyncCsamScannerResource:
+        from .resources.csam_scanner import AsyncCsamScannerResource
+
+        return AsyncCsamScannerResource(self)
+
     @cached_property
     def abuse_reports(self) -> AsyncAbuseReportsResource:
         from .resources.abuse_reports import AsyncAbuseReportsResource
@@ -2275,6 +2306,12 @@ def custom_nameservers(self) -> custom_nameservers.CustomNameserversResourceWith
 
         return CustomNameserversResourceWithRawResponse(self._client.custom_nameservers)
 
+    @cached_property
+    def tenant_custom_nameservers(self) -> tenant_custom_nameservers.TenantCustomNameserversResourceWithRawResponse:
+        from .resources.tenant_custom_nameservers import TenantCustomNameserversResourceWithRawResponse
+
+        return TenantCustomNameserversResourceWithRawResponse(self._client.tenant_custom_nameservers)
+
     @cached_property
     def dns_firewall(self) -> dns_firewall.DNSFirewallResourceWithRawResponse:
         from .resources.dns_firewall import DNSFirewallResourceWithRawResponse
@@ -2769,6 +2806,12 @@ def ai_security(self) -> ai_security.AISecurityResourceWithRawResponse:
 
         return AISecurityResourceWithRawResponse(self._client.ai_security)
 
+    @cached_property
+    def csam_scanner(self) -> csam_scanner.CsamScannerResourceWithRawResponse:
+        from .resources.csam_scanner import CsamScannerResourceWithRawResponse
+
+        return CsamScannerResourceWithRawResponse(self._client.csam_scanner)
+
     @cached_property
     def abuse_reports(self) -> abuse_reports.AbuseReportsResourceWithRawResponse:
         from .resources.abuse_reports import AbuseReportsResourceWithRawResponse
@@ -2944,6 +2987,14 @@ def custom_nameservers(self) -> custom_nameservers.AsyncCustomNameserversResourc
 
         return AsyncCustomNameserversResourceWithRawResponse(self._client.custom_nameservers)
 
+    @cached_property
+    def tenant_custom_nameservers(
+        self,
+    ) -> tenant_custom_nameservers.AsyncTenantCustomNameserversResourceWithRawResponse:
+        from .resources.tenant_custom_nameservers import AsyncTenantCustomNameserversResourceWithRawResponse
+
+        return AsyncTenantCustomNameserversResourceWithRawResponse(self._client.tenant_custom_nameservers)
+
     @cached_property
     def dns_firewall(self) -> dns_firewall.AsyncDNSFirewallResourceWithRawResponse:
         from .resources.dns_firewall import AsyncDNSFirewallResourceWithRawResponse
@@ -3438,6 +3489,12 @@ def ai_security(self) -> ai_security.AsyncAISecurityResourceWithRawResponse:
 
         return AsyncAISecurityResourceWithRawResponse(self._client.ai_security)
 
+    @cached_property
+    def csam_scanner(self) -> csam_scanner.AsyncCsamScannerResourceWithRawResponse:
+        from .resources.csam_scanner import AsyncCsamScannerResourceWithRawResponse
+
+        return AsyncCsamScannerResourceWithRawResponse(self._client.csam_scanner)
+
     @cached_property
     def abuse_reports(self) -> abuse_reports.AsyncAbuseReportsResourceWithRawResponse:
         from .resources.abuse_reports import AsyncAbuseReportsResourceWithRawResponse
@@ -3613,6 +3670,14 @@ def custom_nameservers(self) -> custom_nameservers.CustomNameserversResourceWith
 
         return CustomNameserversResourceWithStreamingResponse(self._client.custom_nameservers)
 
+    @cached_property
+    def tenant_custom_nameservers(
+        self,
+    ) -> tenant_custom_nameservers.TenantCustomNameserversResourceWithStreamingResponse:
+        from .resources.tenant_custom_nameservers import TenantCustomNameserversResourceWithStreamingResponse
+
+        return TenantCustomNameserversResourceWithStreamingResponse(self._client.tenant_custom_nameservers)
+
     @cached_property
     def dns_firewall(self) -> dns_firewall.DNSFirewallResourceWithStreamingResponse:
         from .resources.dns_firewall import DNSFirewallResourceWithStreamingResponse
@@ -4107,6 +4172,12 @@ def ai_security(self) -> ai_security.AISecurityResourceWithStreamingResponse:
 
         return AISecurityResourceWithStreamingResponse(self._client.ai_security)
 
+    @cached_property
+    def csam_scanner(self) -> csam_scanner.CsamScannerResourceWithStreamingResponse:
+        from .resources.csam_scanner import CsamScannerResourceWithStreamingResponse
+
+        return CsamScannerResourceWithStreamingResponse(self._client.csam_scanner)
+
     @cached_property
     def abuse_reports(self) -> abuse_reports.AbuseReportsResourceWithStreamingResponse:
         from .resources.abuse_reports import AbuseReportsResourceWithStreamingResponse
@@ -4284,6 +4355,14 @@ def custom_nameservers(self) -> custom_nameservers.AsyncCustomNameserversResourc
 
         return AsyncCustomNameserversResourceWithStreamingResponse(self._client.custom_nameservers)
 
+    @cached_property
+    def tenant_custom_nameservers(
+        self,
+    ) -> tenant_custom_nameservers.AsyncTenantCustomNameserversResourceWithStreamingResponse:
+        from .resources.tenant_custom_nameservers import AsyncTenantCustomNameserversResourceWithStreamingResponse
+
+        return AsyncTenantCustomNameserversResourceWithStreamingResponse(self._client.tenant_custom_nameservers)
+
     @cached_property
     def dns_firewall(self) -> dns_firewall.AsyncDNSFirewallResourceWithStreamingResponse:
         from .resources.dns_firewall import AsyncDNSFirewallResourceWithStreamingResponse
@@ -4786,6 +4865,12 @@ def ai_security(self) -> ai_security.AsyncAISecurityResourceWithStreamingRespons
 
         return AsyncAISecurityResourceWithStreamingResponse(self._client.ai_security)
 
+    @cached_property
+    def csam_scanner(self) -> csam_scanner.AsyncCsamScannerResourceWithStreamingResponse:
+        from .resources.csam_scanner import AsyncCsamScannerResourceWithStreamingResponse
+
+        return AsyncCsamScannerResourceWithStreamingResponse(self._client.csam_scanner)
+
     @cached_property
     def abuse_reports(self) -> abuse_reports.AsyncAbuseReportsResourceWithStreamingResponse:
         from .resources.abuse_reports import AsyncAbuseReportsResourceWithStreamingResponse

src/cloudflare/resources/csam_scanner/__init__.py

@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .csam_scanner import (
+    CsamScannerResource,
+    AsyncCsamScannerResource,
+    CsamScannerResourceWithRawResponse,
+    AsyncCsamScannerResourceWithRawResponse,
+    CsamScannerResourceWithStreamingResponse,
+    AsyncCsamScannerResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "CsamScannerResource",
+    "AsyncCsamScannerResource",
+    "CsamScannerResourceWithRawResponse",
+    "AsyncCsamScannerResourceWithRawResponse",
+    "CsamScannerResourceWithStreamingResponse",
+    "AsyncCsamScannerResourceWithStreamingResponse",
+]

src/cloudflare/resources/csam_scanner/api.md

@@ -0,0 +1,12 @@
+# CsamScanner
+
+Types:
+
+```python
+from cloudflare.types.csam_scanner import CsamScannerEditResponse, CsamScannerGetResponse
+```
+
+Methods:
+
+- <code title="patch /zones/{zone_id}/settings/csam_scanner_third_party">client.csam_scanner.<a href="./src/cloudflare/resources/csam_scanner/csam_scanner.py">edit</a>(\*, zone_id, \*\*<a href="src/cloudflare/types/csam_scanner/csam_scanner_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/csam_scanner/csam_scanner_edit_response.py">Optional[CsamScannerEditResponse]</a></code>
+- <code title="get /zones/{zone_id}/settings/csam_scanner_third_party">client.csam_scanner.<a href="./src/cloudflare/resources/csam_scanner/csam_scanner.py">get</a>(\*, zone_id) -> <a href="./src/cloudflare/types/csam_scanner/csam_scanner_get_response.py">Optional[CsamScannerGetResponse]</a></code>